before deploying to heroku
Merge branch 'master' of github.com:MichaelYim/angulartrial