Room randomize amount of opponents. Floor generateRoom() into Room generateTraits()
Merge branch 'master' of https://github.com/Trevorr1/RogueGame.git
Trying to fix merge conflicts

conflicts are in floor.cpp room.h and main.cpp