Quincy Larson 3b861a5a7f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
2015-06-02 20:32:10 -07:00
Description
Languages
JavaScript 47.2%
TypeScript 46.3%
CSS 6.1%
Shell 0.2%
Dockerfile 0.1%
Other 0.1%