Fixed changes made to old.js file by mistake
model.js is now a full javascript object and not JSON
Merge branch 'GameModel'

Conflicts:
	.grunt/filewatchertask.js