Merge pull request #9 from isfit/master

Added mailer and filled out infotext in form
Added mailer ,added text in form
Fixed mergeconflict in form
Merge pull request #10 from isfit/mailer

Mailer