Changed gemfile
Merge branch 'master' of https://github.com/CzarcasticJack/SoftFinalProject
Fixed merg