Merged with master
finished frontend
Merge branch 'frontend' of github.com:LaunchAcademy/south_park_reviews into frontend
Merged with frontend
Conflicts:
	app/controllers/episodes_controller.rb