Add collectables
Merge branch 'master' of https://github.com/v--/coderun

Conflicts:
	app/scripts/exception_pack.js
	app/scripts/level.js
Merge branch 'master' of https://github.com/v--/coderun