mail
conflictos

Conflicts:
	config/initializers/smtp_settings.rb
Merge branch 'master' of https://github.com/marcorivm/GenRap

Conflicts:
	config/initializers/smtp_settings.rb