Fixed stupid errors
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Dedicated Server/Code/Server/EngineFiles/Server/ProjectileObject.cpp
	Dedicated Server/Code/Server/EngineFiles/Server/StaticProjectileObject.h
	Source/GameFiles/ClientSide/Client.cpp