refactoring and bug fixes
Merge branch 'master' of github.com:bgirard/ToJAM2013

Conflicts:
	js/game.js