merging
Merge branch 'master' of github.com:thomas15v/Tekkit-Permittor

Conflicts:
	src/thomas15v/TekkitPermittor.java
	src/thomas15v/events/Enchantmentbanner.java