receive changes
Merge branch 'master' of https://github.com/mattwiser/Ecard.ly
lovely changes