Twitter refresh
Merge branch 'master' into twitter

Conflicts:
	main_handler.py
.
Merge pull request #7 from Trimmers/twitter

Twitter