Player can now rest and you can see player info
Merge branch 'master' of https://github.com/snijhof/Dungeons-and-Dragons

Conflicts:
	DungeonsAndDragons/GameManager.cpp