added some manual stuff to bash manually. you probably don't wan't to pull this.
Merge remote-tracking branch 'origin/master'

Conflicts:
	bot/bot.py