app.py
started the html
Merge branch 'daelin' of https://github.com/stuycs-ml7-projects/Diaz into daelin
blah
poop
Merge remote-tracking branch 'origin/daelin' into daelin
app
ya
Merge branch 'daelin'
app
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/stuycs-ml7-projects/Diaz