Settings
Merge branch 'master' of https://github.com/CDevin5/CS151StrategoAI
Merge branch 'master' of https://github.com/CDevin5/CS151StrategoAI