gemfile
Merge branch 'master' of https://github.com/Smoggy/new_diploma_app
fix