Add my public key
Resolve merge conflict
Merge pull request #65 from odyssey4me/master

Add my public key