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