structured to be compliant with heroku
Merge branch 'master' of https://github.com/jonbuckley33/ProjectRed

Conflicts:
	public/scripts/GameManager.js