synching
Merge branch 'master' of https://github.com/adonelick/EvolutionGame

Conflicts:

EvolutionaryGame/EvolutionaryGame.xcodeproj/project.xcworkspace/xcuserda
ta/cs121.xcuserdatad/UserInterfaceState.xcuserstate