merge
Merge branch 'piotrgiedziun-master'
Merge branch 'master' of https://github.com/johniak/dotfiles

Conflicts:
	README.md