ha hhahaha haahhahaha
Merge branch 'master' of https://github.com/aki--aki/xbotpp into v0.3.0

Conflicts:
	modules/nickserv.py