First commit
Merge branch 'master' of https://github.com/KMR-zoar/dotfiles

Conflicts:
	.profile
	.vimrc