Merge branch 'master' into helen
preparing for testing
Merge branch 'master' into helen
app.py and working
app.py working
Merge pull request #21 from stuycs-ml7-projects/helen

Helen