Latest commit
lastest commit
Merge branch 'master' of https://github.com/ericmsauer/game

Conflicts:
	public/javascript/main.js