fix conflict in Gemfile/Gemfile.lock
fix failing specs on master branch
revert migr. to previous state
fix failing migration
Merge pull request #19 from SoftServeUniversity/fix_failing_specs

Fix failing specs