Merge branch 'master', remote-tracking branch 'origin' into dev
Merge branch 'master' into dev
im bad i forgot to commit
Merge branch 'dev' of github.com:jonstout/StratGame into dev