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

Conflicts:
	web/index.pl
Merge branch 'master' of github.com:ninharp/ninbot

Conflicts:
	web/index.pl