Added Mailcatcher
updated readme for mailcatcher info
resolved conflict