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
Merged from master
Added race selection screen, started player command interpreter
Merge branch 'cmd_interpreter' into dev
So many changes...got rid of redundant World class, added player class and one race, added race selection to command interpreter
Merging from cmd_interpreter. Got rid of redundant world class, added a bit to command interpreter, modelled player and human class
updated enemy class with working takemdage function
removedcout statements]
fixed rand gen for enemy; note currently still using arrays
enemies now spawned in an array of enemies...still no vectors
changed cout to printf
gold piles now generation correctly along with dragons
added (untested/basic) potion class + subclasses
removed *.o *.d files
Added enemyfactory, command interface, and rudimentary player movement support
Refined enemy, added enemy factory, added command interface, added basic player movement
Removed compiled files. Woops.
Fixed bug where player could walk over potions