Added the TerritoryRectItem to represent territories on the map, as well as basic map-loading
Fixed merge issues
Changed TerritoryRectItem to use painter instead of QGraphicsProxyWidget
Merge branch 'master' of https://github.com/Jacob959/risk-ai