Didn't do anything
Didn't do shit
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLSetUp/SFMLSetUp.sdf
	SFMLSetUp/SFMLSetUp.suo
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.vcxprojResolveAssemblyReference.cache
Changed the Engine a little
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLSetUp/Debug/SFMLSetUp.exe
	SFMLSetUp/Debug/SFMLSetUp.ilk
	SFMLSetUp/Debug/SFMLSetUp.pdb
	SFMLSetUp/SFMLSetUp.sdf
	SFMLSetUp/SFMLSetUp.suo
	SFMLSetUp/SFMLSetUp/Debug/CL.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/CL.write.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/Engine.obj
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.lastbuildstate
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.log
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.vcxprojResolveAssemblyReference.cache
	SFMLSetUp/SFMLSetUp/Debug/link.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/link.write.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/main.obj
	SFMLSetUp/SFMLSetUp/Debug/vc100.idb
	SFMLSetUp/SFMLSetUp/Debug/vc100.pdb
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLSetUp/Debug/SFMLSetUp.exe
	SFMLSetUp/Debug/SFMLSetUp.ilk
	SFMLSetUp/Debug/SFMLSetUp.pdb
	SFMLSetUp/SFMLSetUp.sdf
	SFMLSetUp/SFMLSetUp.suo
	SFMLSetUp/SFMLSetUp/Ball.cpp
	SFMLSetUp/SFMLSetUp/Debug/Ball.obj
	SFMLSetUp/SFMLSetUp/Debug/CL.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/CL.write.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/Client.obj
	SFMLSetUp/SFMLSetUp/Debug/Engine.obj
	SFMLSetUp/SFMLSetUp/Debug/Globals.obj
	SFMLSetUp/SFMLSetUp/Debug/Paddle.obj
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.lastbuildstate
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.log
	SFMLSetUp/SFMLSetUp/Debug/cl.command.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/link.command.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/link.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/link.write.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/main.obj
	SFMLSetUp/SFMLSetUp/Debug/mt.command.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/mt.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/mt.write.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/rc.command.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/rc.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/rc.write.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/vc100.idb
	SFMLSetUp/SFMLSetUp/Debug/vc100.pdb
	SFMLSetUp/SFMLSetUp/Engine.cpp
	SFMLSetUp/SFMLSetUp/Engine.h
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLSetUp/SFMLSetUp.sdf
	SFMLSetUp/SFMLSetUp.suo
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.vcxprojResolveAssemblyReference.cache
Merge branch 'master' of https://github.com/Gwalks91/pong167
Merge branch 'master' of https://github.com/Gwalks91/pong167
Merge branch 'master' of https://github.com/Gwalks91/pong167
Merge branch 'master' of https://github.com/Gwalks91/pong167
Merge branch 'master' of https://github.com/Gwalks91/pong167
Merge branch 'master' of https://github.com/Gwalks91/pong167
Didnt change anything
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLSetUp/Debug/SFMLSetUp.exe
	SFMLSetUp/Debug/SFMLSetUp.ilk
	SFMLSetUp/Debug/SFMLSetUp.pdb
	SFMLSetUp/SFMLSetUp.sdf
	SFMLSetUp/SFMLSetUp/Debug/Ball.obj
	SFMLSetUp/SFMLSetUp/Debug/CL.write.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/Engine.obj
	SFMLSetUp/SFMLSetUp/Debug/Globals.obj
	SFMLSetUp/SFMLSetUp/Debug/Paddle.obj
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.log
	SFMLSetUp/SFMLSetUp/Debug/link.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/vc100.idb
	SFMLSetUp/SFMLSetUp/Debug/vc100.pdb
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLSetUp/Debug/SFMLSetUp.exe
	SFMLSetUp/Debug/SFMLSetUp.ilk
	SFMLSetUp/Debug/SFMLSetUp.pdb
	SFMLSetUp/SFMLSetUp.sdf
	SFMLSetUp/SFMLSetUp.suo
	SFMLSetUp/SFMLSetUp/Debug/CL.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/Client.obj
	SFMLSetUp/SFMLSetUp/Debug/Player.obj
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.log
	SFMLSetUp/SFMLSetUp/Debug/Score.obj
	SFMLSetUp/SFMLSetUp/Debug/main.obj
	SFMLSetUp/ipch/sfmlsetup-ecf3e5aa/sfmlsetup-f65bb00f.ipch
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLSetUp/SFMLSetUp/Debug/link.read.1.tlog
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLNetwork/SFMLNetwork/Release/CL.read.1.tlog
	SFMLNetwork/SFMLNetwork/Release/CL.write.1.tlog
	SFMLNetwork/SFMLNetwork/Release/Client.obj
	SFMLNetwork/SFMLNetwork/Release/SFMLNetwork.log
	SFMLNetwork/SFMLNetwork/Release/SFMLServer.exe
	SFMLNetwork/SFMLNetwork/Release/SFMLServer.lastbuildstate
	SFMLNetwork/SFMLNetwork/Release/SFMLServer.pdb
	SFMLNetwork/SFMLNetwork/Release/Server.obj
	SFMLNetwork/SFMLNetwork/Release/cl.command.1.tlog
	SFMLNetwork/SFMLNetwork/Release/link.command.1.tlog
	SFMLNetwork/SFMLNetwork/Release/link.read.1.tlog
	SFMLNetwork/SFMLNetwork/Release/link.write.1.tlog
	SFMLNetwork/SFMLNetwork/Release/main.obj
	SFMLNetwork/SFMLNetwork/Release/mt.command.1.tlog
	SFMLNetwork/SFMLNetwork/Release/mt.read.1.tlog
	SFMLNetwork/SFMLNetwork/Release/mt.write.1.tlog
	SFMLNetwork/SFMLNetwork/Release/vc100.pdb
	SFMLNetwork/SFMLNetwork/SFMLNetwork.sdf
	SFMLNetwork/SFMLNetwork/SFMLNetwork.suo
	SFMLNetwork/SFMLNetwork/SFMLNetwork.vcxproj
	SFMLNetwork/SFMLNetwork/ipch/sfmlnetwork-783c9575/sfmlserver-6127600f.ipch
	SFMLSetUp/Debug/SFMLSetUp.exe
	SFMLSetUp/Debug/SFMLSetUp.ilk
	SFMLSetUp/Debug/SFMLSetUp.pdb
	SFMLSetUp/SFMLSetUp.sdf
	SFMLSetUp/SFMLSetUp/Debug/Ball.obj
	SFMLSetUp/SFMLSetUp/Debug/Engine.obj
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.log
	SFMLSetUp/SFMLSetUp/Debug/link.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/vc100.idb
	SFMLSetUp/SFMLSetUp/Debug/vc100.pdb
Changed the server
Merge branch 'master' of https://github.com/Gwalks91/pong167

Conflicts:
	SFMLNetwork/SFMLNetwork/Release/SFMLNetwork.log
	SFMLNetwork/SFMLNetwork/SFMLNetwork.sdf
	SFMLNetwork/SFMLNetwork/SFMLNetwork.suo
	SFMLSetUp/Debug/SFMLSetUp.exe
	SFMLSetUp/Debug/SFMLSetUp.ilk
	SFMLSetUp/Debug/SFMLSetUp.pdb
	SFMLSetUp/SFMLSetUp.suo
	SFMLSetUp/SFMLSetUp/Debug/Globals.obj
	SFMLSetUp/SFMLSetUp/Debug/Paddle.obj
	SFMLSetUp/SFMLSetUp/Debug/SFMLSetUp.log
	SFMLSetUp/SFMLSetUp/Debug/link.read.1.tlog
	SFMLSetUp/SFMLSetUp/Debug/vc100.idb
	SFMLSetUp/SFMLSetUp/Debug/vc100.pdb