Add in mailers
Merge branch 'master' of https://github.com/niloufars/Sophos_project

Conflicts:
	app/views/static_pages/home.html.erb
	log/development.log