ignore blank email or something
Merge branch 'master' of github.com:boourns/showme
Merge branch 'master' of github.com:boourns/showme