Merge branch 'master' into master

Author: kenyonj

collections/programming-languages/index.md

@@ -44,6 +44,7 @@ items:
 - eclipse/golo-lang
 - gosu-lang/gosu-lang
 - ziglang/zig
+- HaxeFoundation/haxe
 display_name: Programming languages
 created_by: leereilly
 ---

collections/teaching-computational-social-science/index.md

@@ -0,0 +1,48 @@
+---
+items:
+ - uchicago-computation-workshop
+ - UC-MACSS
+ - UM-CSS
+ - gesiscss
+ - DS-BootCamp-DSI-Columbia/AY2017-2018-Summer-CSS
+ - h2researchgroup/Computational-Analysis-For-Social-Science
+ - ben-aaron188/ltta_workshop
+ - ribernhard/PS239T
+ - msalganik/soc596_f2016
+ - nealcaren/python-tutorials
+ - jacobeisenstein/gt-css-class
+ - jacobeisenstein/gt-nlp-class
+ - eytan/www-15-tutorial
+ - pablobarbera/POIR613
+ - sf585978/cssReadingList
+ - damian0604/bdaca/blob/master/book/bd-aca_book.pdf
+ - vtraag/4TU-CSS
+ - honeyAndSw/computational-social-science
+ - 5harad/css
+ - jaeyk/PS239T
+ - jhofman/css2013
+ - mac389/snappy
+ - peterdalle/mediacommtools
+ - dmasad/cssGradWorkshops
+ - HerTeoh/computational_social_science
+ - mobileink/lab.compss
+ - mmonzoor/computational_social_science_course_notebooks
+ - sschauss/css
+ - jongbinjung/css-python-workshop 
+ - adamrpah/KPHD_CSS
+ - cbpuschmann/stm_ic2s2
+ - ohexel/comsocsci
+ - atkindel/css_activities
+ - chandrasg/lexica
+ - PsiPhiTheta/Computational-SocSci-Labs
+ - maczokni/R-for-Criminologists
+ - maczokni/crimemapping_textbook_bookdown
+ - maczokni/r-socialsci
+ - CJWorkbench
+ - CullenBoldt/CSSproject
+ 
+display_name: Teaching materials for computational social science
+created_by: danielagduca
+image: teaching-computational-social-science.png
+---
+Resources from and for teachers, trainers, lecturers and professors that are creating or running courses in computational social science, at any level.

collections/teaching-computational-social-science/teaching-computational-social-science.png

@@ -0,0 +1,14 @@
+---
+aliases: nuxtjs
+created_by: Sébastien Chopin & Alexandre Chopin
+display_name: Nuxt.js
+github_url: https://github.com/nuxt/nuxt.js
+logo: nuxt.png
+related: javascript, vue, ssr, spa
+released: November 2016
+short_description: Nuxt.js is a Vue.js Meta Framework to create complex, fast & universal web applications quickly.
+topic: nuxt
+url: https://nuxtjs.org
+wikipedia_url: https://en.wikipedia.org/wiki/Nuxt.js
+---
+Nuxt.js is a framework for creating Vue.js applications. You can choose between Universal, Static Generated or Single Page applications.