Commit so i can get updates.

Signed-off-by: Rikard Johansson <rillee.johansson@gmail.com>
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/Server/Source/Game.cpp