Merge branch 'master' of github.com:JimTheCactus/GummyBot

Conflicts:
	gb.pl