Merge branch 'db'
added heroku toolbelt and uri
Merge branch 'feature/mongo'
resolved merge conflict