Removed binding.pry
Added rescue for if session data has been manipulated
Merge branch 'view'

Conflicts:
	app/controllers/application_controller.rb