Confile file init
Merge branch 'master' of https://github.com/Mysterie/Twittos

Conflicts:
	config.py