Readme edit
Readme conflict resolve
Merge pull request #4 from alexung/alex_mailgun

Readme edit