Added
Merge branch 'master' of https://github.com/kmilanez/globaljam

Conflicts:
	game/game.js