Finished testing for user CRUD
Revert "Revert "Add episodes""
fixed disaster 1 and made Eric's recommended changes
Merge remote-tracking branch 'origin' into tests
more of Eric's small changes
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 WIP_create_votes
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
Merge pull request #24 from LaunchAcademy/revert-23-revert-21-add_episodes

Add episodes"
Fixed Schema
Merge branch 'master' of github.com:LaunchAcademy/south_park_reviews into WIP_create_votes