merge
Merge branch 'master' of github.com:BatedUrGonnaDie/salty_bot

Conflicts:
	bot.py
Merge branch 'master' of github.com:BatedUrGonnaDie/salty_bot

Conflicts:
	bot.py