Items worked out
Merge branch 'master' of https://github.com/snijhof/Dungeons-and-Dragons

Conflicts:
	DungeonsAndDragons/DungeonsAndDragons.vcxproj.filters
Merge branch 'master' of https://github.com/snijhof/Dungeons-and-Dragons

Conflicts:
	DungeonsAndDragons/Debug/Dungeons.D484DBBA.tlog/DungeonsAndDragons.lastbuildstate