Updated class Room's __init__ and all rooms

Added a map_x and map_y to the __init__ of Room, and changed the imput parameters. Modified all rooms to work with the new Room class modifications.
Merge pull request #1 from ryan-johnson2/patch-1

Updated class Room's __init__ and all rooms