what
what
what
Merge branch 'master' of https://github.com/aneeshde/Research-Sharing

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
Merge branch 'master' of https://github.com/aneeshde/Research-Sharing