added capturing of user email and id
Merge branch 'master' of https://github.com/ecc-weizhi/cs3213MovieApp

Conflicts:
	app/controllers/main_controller.rb
added storing of user's creditals , fixed logout issue