initial commit
Merge branch 'master' of github.com:eriktaubeneck/flask-social-example

Conflicts:
	.gitignore
	Procfile
	app/config/app.yml
	app/forms.py
	app/github.py
	app/templates/profile.html
	app/views.py
	requirements.txt