Fixed the issues with the room, and also changed colors.
Merge branch 'master' of https://github.com/jshiraef/zeldaesque

Conflicts:
	Zeldaesque/src/com/zeldashtuff/jshiraef/Room.java
Merge pull request #4 from arcym/master

Fixed the issues with the room, and also changed colors.