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

Conflicts:
	install.conf.yaml