Added a location object that holds a location w/ the room, and the x and
y location within the room

Deleted extra main methods