GameStates should complete flow now
Merge branch 'dev' of https://github.com/huntmiester/GeoBattles into dev
Basic properties changes
Merge https://github.com/huntmiester/GeoBattles
Merge remote-tracking branch 'upstream/dev'
Petey's Commit
removed git folder
removed AppData and Documents folder
UI stuffs
Fixing a few details.
Added res/menu
Merge branch 'dev' of https://github.com/huntmiester/GeoBattles into dev
Main Menu and Battle Screen works.
temp
conflict fix
Fixed some details.
Created the Jock class and fixed a few issues.