heroku setup
Merge branch 'master' of https://github.com/lisabell-li/Info3