Merge branch 'master' of github.com:ninharp/ninbot

Conflicts:
	ninbot.pm
Merge branch 'master' of github.com:ninharp/ninbot

Conflicts:
	ninbot.pm