sync
Merge branch 'master' of github.com:and-floaty-rocks/browsercraft

Conflicts:
	dist/app.js
	dist/browsercraft.js
	lib/engine.js