why
fixed merge conflicts
please
fixed merge
gemfile
Merge pull request #55 from Eventalist/theerickramer

Theerickramer