moar buttonZ!
Merge branch 'master' of https://github.com/lampe/gamejam14

Conflicts:
	src/preloader.js