test
asdMerge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning

Conflicts:
	templates/settings.html
Merge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning
updated settings