Fixing the merge issue

dunno why tho
Room randomize amount of opponents. Floor generateRoom() into Room generateTraits()
Merge branch 'master' of https://github.com/Trevorr1/RogueGame.git