Added Luxary and Normal Rooms
Merge branch 'master' of https://github.com/mikephe/cs151Project