more
rsync
Merge branch 'master' of github.com:alanszlosek/dotfiles

Conflicts:
	archlinux-setup.txt
Merge branch 'master' of github.com:alanszlosek/dotfiles

Conflicts:
	archlinux-setup.txt
more