Bullet!
Merge branch 'master' of github.com:ripter/LD30

Conflicts:
	lib/game/main.js