Saved changes to the GameSocketController
Merge branch 'master' of https://github.com/UofM-COMP4350-4/NBGI into localBranch
Starting work on the fakeServer for the Integration tests
Merged localbranch with master
Finished initial fake Server development
Re-added socket.io-objc framework
Merge branch 'fakeServerIntegrationTests' of https://github.com/UofM-COMP4350-4/NBGI into fakeServerIntegrationTests
Added a clientConnectedToServer event
Merge branch 'fakeServerIntegrationTests' of https://github.com/UofM-COMP4350-4/NBGI into fakeServerIntegrationTests
Added socket.io delegate to ios
Finished creating the setup event for the fakeServer
Merge branch 'fakeServerIntegrationTests' of https://github.com/UofM-COMP4350-4/NBGI into fakeServerIntegrationTests
Updated socket logic.
Updated iOS to send events when a socket message is received.
Updated for working web client communications
Started DBAccess tests.  iOS client communication code.
[Cam & Sam & Chris] Updated iOS client to receive moves and play moves.
Merge branch 'master' into fakeServerIntegrationTests

Conflicts:
	server/tests/serverTests.js
Travis fixes.
Made changes to the server so it can return a cross origin allowed header in a few responses