instructions
yo
Merge branch 'master' of https://github.com/XicoMBD/moonshot

Conflicts:
	public/js/game.js