random changes
fixed merge
changes to cron
more changes to cron
raising errors on application mailer