Initialized on my old good laptop
Merge branch 'master' of https://github.com/vovka/home

Conflicts:
	.gitconfig