Random stuff I never committed?
Merge branch 'master' of https://github.com/realphake/MarioDifficulty

Conflicts:
	Mario/Human/nbproject/private/private.properties
	Mario/Human/nbproject/private/private.xml