Remove file that is no longer needed.
Merge branch 'master' of https://github.com/KenKundert/password

Conflicts:
	test_settings/master.gpg
Deleted file that is no longer needed.