.gitignore created by brackets-git extension
add
Merge branch 'master' of https://github.com/Delfa/Flaskr

Conflicts:
	.gitignore