rescue started working
Merge branch 'master' of github.com:lavanyafd/codejam123

Conflicts:
	app/controllers/login_controller.rb
	lib/worker/csv_import_worker.rb