vimrc
zshrc
Merge branch 'master' of https://github.com/hro424/config

Conflicts:
	dot.vimrc