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

Conflicts:
	app.py
edited addEvent call in app.py
Merge branch 'master' of https://github.com/stuycs-softdev/proj2-pd6-06-GoodMorning