Add Enpass to the Password Management category
Add enpass to Password Management category
Remove conflict markers
Merge pull request #65 from dalleng/master

Add Enpass to the Password Management category