First db set up
Working db
Merge branch 'setting-models' into setting-flask

Conflicts:
	heroes/views.py
	requirements.txt