Changed GameState to consume a Game model
Added #to_json to game_state, renamed match to game in game_spec
Merge branch 'develop' of https://github.com/RantGames/skirmish into refactoring

Conflicts:
	spec/models/game/game_spec.rb
Renamed remaining game folders to skirmish
Merge pull request #22 from RantGames/refactoring

Refactoring