made fe changes`
Merge branch 'master' of https://github.com/Mandeep05/tnotyhingmmuch

Conflicts:
	app/mailers/user_mailer.rb
	app/views/welcome/index.html.erb
Updated code
updated the emial