dont know what i changed
Merge branch 'master' of https://github.com/CDevin5/CS151StrategoAI

Conflicts:
	game.py
merge conflict