Finished testing for user CRUD
Use ruby 2.1.2
Merge pull request #25 from LaunchAcademy/use-ruby-2.1.2

Use ruby 2.1.2
Merge remote-tracking branch 'origin' into tests
Fixed back button bug, and fixed user show bug
Merge pull request #28 from LaunchAcademy/bug_fixes

Fixed back button bug, and fixed user show bug
Refactored code
Merge pull request #22 from LaunchAcademy/tests

Finished testing for user CRUD
Merge branch 'master' of github.com:LaunchAcademy/south_park_reviews into revert-23-revert-21-add_episodes

Conflicts:
	app/models/user.rb
	db/schema.rb