Initial commit
Merge branch 'master' of github.com:Hacklor/dotfiles into backup

Conflicts:
	README.md