formatting changes
Merge branch 'master' of https://github.com/laurenmanzo/HurrJavaScript

Conflicts:
	Model/controlGame.js
Added commenting showing who did what