init commit
modified .gitignore
Merge branch 'master' of github.com:cghiban/flaskintro

Conflicts:
	.gitignore
no more conflicts