added html config
Merge branch 'master' of github.com:gibiansky/dotfiles

Conflicts:
	foreign/zsh/zsh.config