made rooms random
managed merge conflicts
Merge branch 'working-on-weapons'