.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Altitude-Rpg/.classpath
	Altitude-Rpg/src/me/Altitude/RPG/Main.java