First commit
Merge branch 'master' of https://github.com/bjarniolsen/dotfiles

Conflicts:
	README.md