Revert "Revert "Add episodes""
fixed disaster 1 and made Eric's recommended changes
more of Eric's small changes
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"