First Commit.
Merge branch 'master' of https://github.com/midolin/DotFiles

Conflicts:
	.vimrc
	.zshrc