Added bandage
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Client/Source/Client.cpp
	Game/Game.vcxproj.filters
	Server/Server/Source/Game.cpp
	Server/Server/Source/PlayerHumanBehavior.cpp