change controlGame
Merge branch 'master' of https://github.com/laurenmanzo/HurrJavaScript

Conflicts:
	Model/controlGame.js