3.6 tested
Merge branch 'master' of github.com:Ipstenu/ban-hammer
Merge branch 'master' of github.com:Ipstenu/ban-hammer

Conflicts:
	readme.txt
AUUUGH