Quincy Larson 9275bd5076 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-08-13 15:39:30 -07:00
2015-06-09 16:49:03 -07:00
2015-08-10 23:29:32 -07:00
Description
Languages
JavaScript 47.2%
TypeScript 46.3%
CSS 6.1%
Shell 0.2%
Dockerfile 0.1%
Other 0.1%