more writing
made changes ...
Merge branch 'master' of https://github.com/CDevin5/CS151StrategoAI
fixed merge conflict in game.py