Temp
Merge branch 'master' of git://github.com/lukes3315/ServerClient

Conflicts:
	ServerApp/Client.cpp
Well after deleting I am recreating it