Still working on the server/client networking

Precautionary push
Merge branch 'master' of https://github.com/Yuurt/TomatoFighters

Conflicts:
	TheClient/ConsoleApplication1/main.cpp

Commiting a merge?