fixing email merge conflicts
Merge branch 'master' of github.com:presidentJFK/Ign