working on heroku deployment
Merge branch 'master' of https://github.com/tsquared89/future