Adding beging of line
Merge branch 'master' of github.com:ethankhall/dotfiles

Conflicts:
	.zshrc