closes #1 #2
Merge branch 'master' of github.com:Pheasn/NewEndermen