stuffz
Merge branch 'master' of https://github.com/acidorg/AcidicFreedom

Conflicts:
	src/me/acidorg/AcidicFreedom/AcidicFreedom.java
Misc.