Began work on chrome extension (currently does not work)
Merge branch 'master' of https://github.com/jsharf/Encrypted-Email

necessary because I was a derp and accidentally pushed before pulling :(