Merging
Merging
Tweaking app.py
Merge branch 'Jason' of https://github.com/stuycs-softdev/proj2-pd6-05-FunThingsAreFun into Jason
removed
merge conf
Merge branch 'master' of github.com:stuycs-softdev/proj2-pd6-05-FunThingsAreFun