commit or stash
Merge branch 'master' of https://github.com/TylerSandman/cc3k

Conflicts:
	src/cc3k
added basic instruction screen
Finished random floor generation, fixed seg fault when enemies had nowhere to go, added 50 percent chance for enemy attack misses
Merge branch 'floor_generation' into dev