encryption + gui
Merge branch 'master' of github.com:danigrant/fbcrypt

Conflicts:
	script.js