fixed networking
multiplayer should work now
Merge branch 'master' of https://github.com/fireDude90/SFML-Platformer

Conflicts:
	Debug/SFML Platformer.exe
	Debug/SFML Platformer.ilk
	Debug/SFML Platformer.pdb
	SFML Platformer.sdf
	SFML Platformer.v11.suo
	SFML Platformer/Debug/CL.read.1.tlog
	SFML Platformer/Debug/CL.write.1.tlog
	SFML Platformer/Debug/DrawableGameObject.obj
	SFML Platformer/Debug/Fade.obj
	SFML Platformer/Debug/Game.obj
	SFML Platformer/Debug/GameObject.obj
	SFML Platformer/Debug/Level.obj
	SFML Platformer/Debug/Player.obj
	SFML Platformer/Debug/SFML Platformer.Build.CppClean.log
	SFML Platformer/Debug/SFML Platformer.log
	SFML Platformer/Debug/SFML Platformer.pch
	SFML Platformer/Debug/ScrollingBackground.obj
	SFML Platformer/Debug/link.read.1.tlog
	SFML Platformer/Debug/main.obj
	SFML Platformer/Debug/stdafx.obj
	SFML Platformer/Debug/vc110.idb
	SFML Platformer/Debug/vc110.pdb
	SFML Platformer/DrawableGameObject.cpp
	SFML Platformer/Fade.cpp
	SFML Platformer/Game.h
	SFML Platformer/Level.cpp
	SFML Platformer/Player.cpp
	SFML Platformer/Player.h
	SFML Platformer/stdafx.h
	Server/server.js
fixed GIT being stupid
removed old server project
gitignore