Added current contents of password store.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gpg-id