fixing mailer to be from mrpink.sose@gmail.com instead of franks monsterporium
fixed merge conflicts