Fixed UNIX line endings
Merge branch 'master' of https://github.com/sheedy/dotfiles

Conflicts:
	home/.git_template/hooks/prepare-commit-msg