Work modifications
Merge branch 'master' of github.com:zacsek/dotfiles

Conflicts:
	installed-software