Changed the server
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLSetUp/SFMLSetUp.suo
I didnt change ANYTHING!!!