latest iteration
Merge branch 'master' of github.com:koeart/pentabot

Conflicts:
	pentabot.py
elbabsaufer funzt net