First pass at testing javascript learning objectives
Merge branch 'master' into gs-add-javascript-testing-learning-objectives
* fixing merge conflict
Merge branch 'master' into gs-add-javascript-testing-learning-objectives

Conflicts:
	week-2/learning-objectives.md
Merge pull request #86 from gopher-snakes-2013/gs-add-javascript-testing-learning-objectives

First pass at testing javascript learning objectives