Merge branch 'master' of https://github.com/brianhouse/angryhermitbot

Conflicts:
	main.py
tega commit