harsh changes
testing branch harsh1
added line 6 in harsh1 branch from github
Merge branch 'harsh1' with master

Conflicts:
	app/views/contacts/homepage.erb