Finisihed GameManager
Added factory methods to Strategy and GameMap
Merge branch 'master' of https://github.com/jmeline/risk
Fixed merge conflicts in Game.cpp, which were marked by Jacob