added yml
Merge branch 'develop' of https://github.com/RantGames/skirmish into added-yml
Merge pull request #9 from RantGames/added-yml

added yml
fixed database yml file name
Merge pull request #10 from RantGames/added-yml

fixed database yml file name
Merge pull request #8 from RantGames/gamestate_parser

Fixed some migrations; failing test for game_parser_spec
travis now just tests develop and master
Merge pull request #11 from RantGames/added-yml

travis now just tests develop and master
Marked failing test as pending
Added webclient as submodule
Changed web module to use https instead of ssh for travis's sake
Merge pull request #12 from RantGames/webclient-submodule

Put the webclient in a submodule
Merge branch 'develop' of https://github.com/RantGames/skirmish into gamestate_parser
Unmarked test as pending