read me
Merge branch 'master' of https://github.com/pweil-/dotfiles

Conflicts:
	README.md