whatever
Merge branch 'master' of https://github.com/huw/monstercat-bot

Conflicts:
	.gitignore