Changed back to pre tag
Merge remote-tracking branch 'upstream/master'
Merge pull request #84 from SonOfLysander/master

Changed back to pre from textarea
Added basic framework to persist rsa key thoughtout the browser session
Updates Lock Icon
Added ability to remove friend
Merge..
Merge pull request #85 from new4931/master

Ability to remove friend
Updates Lock Icon v3
Merge branch 'master' of https://github.com/PigBoT/ragingDipsticks
Changes name to 'Foggy Window by RDS'
Expanded fill functionality
Icon
Merge pull request #87 from SonOfLysander/master

Expanded Fill Functionality and added royalty free pic
added transparency to email button
Merge branch 'master' of https://github.com/kidaki/ragingDipsticks into kidaki-master

Conflicts:
	EncryptionMockSprintTwo/injection.html
set key, and button image
Clean up and some styling
Public key can now be copied to clipboard
Merge pull request #88 from SonOfLysander/master

added transparency to email button