modified package.json and connected heroku mongoDB
pulled master branch changes and fixed merge conflict
Merge pull request #21 from jsmit032/heroku

Heroku