Fixed Gemfile merge conflicts
Removed OpenShift index page
Merge pull request #17 from codeRIT/hotfix/gemfile

Fixed Gemfile merge conflicts