Merge branch 'mailer'
merge attempt 2
fixed landing page pic sized and added to images
deploying to Heroku attempt
trying to fix merge conflicts
deleted gemlock