git made me do this, no changes
Merge branch 'master' of https://github.com/VincentLou/HCI_Project
Merge branch 'master' of heroku.com:lifeup