Simple Game Changes
Merge branch 'master' of https://github.com/belteshazzar543/TowerTheAscent

Conflicts:
	public/main/main.js