Initial commit.
Merge branch 'master' of github.com:charz/dotfiles

Conflicts:
	README.md