Merge branch 'master', remote-tracking branch 'origin' into dev
Merge branch 'master' into dev
initial building code
im bad i forgot to commit
Merge branch 'dev' of github.com:jonstout/StratGame into dev
added inital unitmanager class and added get_id func to unit
fixed conflicts
forget
Updated test map, and added unit_manager to main. Need to work into game.py and possible have unitmanager handle the attack matrix
Integrated unitmanager into game.py