made a BETTER white space edit than Andrew
Merge branch 'master' of https://github.com/jshiraef/zeldaesque.git

Conflicts:
	Zeldaesque/src/com/zeldashtuff/jshiraef/Room.java