changed colors
Merge branch 'master' of https://github.com/jshiraef/zeldaesque

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