Merge branch 'master' of github.com:MrBri/dotfiles

Conflicts:
	README.md
Merge branch 'master' of github.com:MrBri/dotfiles

Conflicts:
	README.md