update
updated code
Merge branch 'master' of https://github.com/sudhirsb2003/groupin

Conflicts:
	app/controllers/events_controller.rb
	app/views/events/index.html.erb
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb