Bullets;
Merge branch 'master' of github.com:bgirard/ToJAM2013

Conflicts:
	js/main.js