Updates
Merge branch 'master' of github.com:dokipen/crap.io

Conflicts:
	app.js
Fix deps