Clear out add new friend dalog when a new friend is added
Merge branch 'master' of https://github.com/PigBoT/ragingDipsticks
Fixed wording on your private key to your public key
add irving to readme
Merge pull request #91 from new4931/master

clear out friend dialog once we add a new friend
Merge branch 'master' of https://github.com/kidaki/ragingDipsticks into kidaki-master
Merge branch 'master' of https://github.com/PigBoT/ragingDipsticks

Conflicts:
	EncryptionMockSprintTwo/injection.html
quick fixed potential error in sendEmail button
Merge pull request #93 from SonOfLysander/master

quick fixed potential error in sendEmail button
Fixed z-index... Maybe??
Quickly uncommented the popup.js line.
Merge pull request #94 from SonOfLysander/master

z-index fix.
Re-commented to not break David's environment
Merge pull request #95 from SonOfLysander/master

Re-commented to not break David's environment
Update. Added ScrSht
Same screenshot more formats. ChromeStore is having errors, otherwise I'd upload at least one of these.
Had to update, I accidently uploaded a version that

had popup.js commented out.
small updates
Merge pull request #96 from SonOfLysander/master

Added screenshot and updated version number.
First pass at per-session authentication, not per loaded page