test commit
testing
Merge branch 'master' of https://github.com/s4weng/cc3k

Conflicts:
	README.md
more testing
testing file
basic character selection/initialization
Merge branch 'master' of https://github.com/s4weng/cc3k
same as before + display info, overload it later with displayWorld
added gold hoard and enemy random generator...put in floor files for now
change to notes
change to notes
test
test
Merge branch 'dev' of https://github.com/TylerSandman/cc3k into dev

Conflicts:
	README.md
	src/Makefile
	src/cc3k.cc
	src/cell.cc
	src/cell.h
	src/chamber.cc
	src/chamber.h
	src/floor.cc
	src/floor.h
	src/game.cc
	src/game.h
	src/item.cc
	src/item.h
	src/world.cc
	src/world.h