stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/app.js
Merge branch 'master' of https://github.com/pccsei15/ninja