minor changes
fixed merge conflicts
Merge pull request #24 from Codes-With-Eagles-SWE2014/ecgprc_sprint3

Ecgprc sprint3
troop migrations
Merge pull request #25 from Codes-With-Eagles-SWE2014/jrlmwc_sprint3

Created generic Flag Handler class for setting port, number of players, ...
Incorporated flag handler class with the game server so you can pass in flags such as -p <port number>, -n <max # players>, etc