some gemfile shit
trying to resolve merge issues- deleted id that might be causing it
merge conflicts fixed
Merge pull request #43 from sidpatel13/solving_fahia_issues

solving sids merge conflicts