Fixing something weird here
Merge branch 'master' of https://github.com/Nystul/MotE

Conflicts:
	build.properties