why gmail sho evil
conflict

Merge branch 'master' of https://github.com/Rawkcy/blingmail