debug app.py
Merge branch 'master' of https://github.com/stuycs-softdev/proj1-6

Conflicts:
	EHTT/app.py