Stuff
Stuff
Merge branch 'demo' of https://github.com/Singlecharacter/RogueLike into demo

Conflicts:
	RogueLike/Item.cpp
	RogueLike/Player.cpp
	RogueLike/RogueLike.depend
	RogueLike/RogueLike.layout
	RogueLike/bin/Debug/RogueLike.exe
	RogueLike/items.txt
	RogueLike/log.txt
	RogueLike/obj/Debug/Chest.o
	RogueLike/obj/Debug/Control.o
	RogueLike/obj/Debug/Enemy.o
	RogueLike/obj/Debug/Item.o
	RogueLike/obj/Debug/Player.o
	RogueLike/obj/Debug/main.o
	RogueLike/obj/Debug/meleeCreature.o
	RogueLike/obj/Debug/meleeHumanoid.o
	RogueLike/obj/Debug/rangedArcher.o
	RogueLike/obj/Debug/rangedMagic.o
	RogueLike/stats.txt