fixed bugs
Merge branch 'master' of https://github.com/malte70/retweetbot

Conflicts:
	log.py