Add admin rights, bugfix in user controller
Update episodes_controller.rb
Update application_controller.rb
Merge pull request #31 from LaunchAcademy/add_admin_rights

RFP Add admin rights, bugfix in user controller
comitting to merge
Merge branch 'master' of github.com:LaunchAcademy/south_park_reviews into create_votes_for_episodes

Conflicts:
	app/models/user.rb
	app/views/episodes/show.html.erb