fixed merge conflicts on gemfile.lock and begining stages of twitter feed