Initial flask app for twitter authentication
Update gitignore
Merge branch 'master' of https://github.com/Hipo/calabash

Conflicts:
	.gitignore