Update forms.py
Update db.py
Update forms.py
Update app.py
Update forms.py
wip
Merge branch 'forms' of github.com:JonCooperWorks/database into forms

Conflicts:
	forms.py
Merge branch 'master' into forms

Conflicts:
	app.py
	forms.py
works
Merge branch 'master' into forms

Conflicts:
	db.py
Merge pull request #26 from JonCooperWorks/forms

Forms
more works
Merge pull request #28 from JonCooperWorks/forms

more works
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app.py