not sure if some functions in util.py is needed
extra functions?
Merge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning

Conflicts:
	utils.py
edited some jinja stuff
fadsfMerge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning

Conflicts:
	utils.py
Merge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning
testing app.py
Merge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning
Merge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning