finished action mailer
resolved merge js confilicts
Merge branch 'master' of https://github.com/cbestiva/project2
something