just committing before pulling
Merge branch 'master' of https://github.com/cindyliu/e250-final-project
everything working
everything working