.
Merge branch 'master' of github.com:brynedwards/dotfiles

Conflicts:
	store.gpg

.