using git for heroku deployment
Merge branch 'master' of https://github.com/pharmak0n/heroku-demo