Install packages modified
Updating installed software list
Merge branch 'master' of github.com:zacsek/dotfiles

Conflicts:
	installed-software