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
merged master