Merge branch 'master' of https://github.com/matthew-somers/158-C-client-server

Conflicts:
No idea why a merge is necessary.

Merge branch 'master' of https://github.com/matthew-somers/158-C-client-server
Edited .gitignore