Merged some files (?)
Merge branch 'master' of github.com:xytis/.home

Conflicts:
	.gitconfig