Commiting to pull
Fixing merge
saving work
Fixing merge conflicts
Adding part of the computer controlled strategy
Resolving merge conflict. Joseph please take a look at the game.cpp. I have commented out some conflicts I wasn't sure about.