some fun
Merge branch 'master' of https://github.com/ChillyBwoy/clj-sandbox

Conflicts:
	resources/public/javascripts/app.js
	src/cljs/sandbox/apps/fps.cljs