Event page
Merge branch 'master' of https://github.com/manishaharidas/Q-Link

Conflicts:
	app/assets/stylesheets/login.css
	log/development.log
	tmp/cache/assets/C44/4C0/sprockets%2F63d264b428733ba84080630af90d6332
	tmp/cache/assets/CC0/E50/sprockets%2Fd95d8c166488063ff82f91df62a08161
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D7F/D50/sprockets%2F943363139b2ce7b9be47fe9c36be92bf
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
Added event page
Merge branch 'master' of https://github.com/manishaharidas/Q-Link

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	config/routes.rb
	db/schema.rb
	log/development.log
	tmp/cache/assets/C44/4C0/sprockets%2F63d264b428733ba84080630af90d6332
	tmp/cache/assets/CC0/E50/sprockets%2Fd95d8c166488063ff82f91df62a08161
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D7F/D50/sprockets%2F943363139b2ce7b9be47fe9c36be92bf
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af