some codecademy tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	src-test/codecademy-test.js