added heroku
intialized gem
added README docs
fixed merge conflicts