Grunt tasks changed to suit web storm.
Fixed conflicts
Merge branch 'GameModel'

Conflicts:
	.grunt/filewatchertask.js
Merge pull request #3 from Koolaidman64/GameModel

Split model.js into two services model.js and gameAPI.js