Initial commit
Initial commit.
Virtualenv prevention added .gitignore
added tables
Initial commit
merge conflicts resolved
Merge branch 'master' of github.com:lqwinters/Flaskr

Conflicts:
	.gitignore
	README.md

Conflicts:
	.gitignore
	README.md
conflicts fixed