Arijit Changes
Merge branch 'Sunny' of github.com:ptotem/New_ET into arijit

Conflicts:
	.idea/New_ET.iml
	.idea/workspace.xml
	app/views/layouts/application.html.erb
	app/views/welcome/index.html.erb
	config/database.yml
Merge branch 'arijit' of github.com:ptotem/New_ET into Sunny
all changes had been done with new layout