Bla bla bla
Merge branch 'master' of https://github.com/v--/coderun

Conflicts:
	app/scripts/console.js
	app/scripts/index.js
	app/scripts/player.js
collectable