Add Go Env
Fix
UPdate
Merge branch 'master' of github.com:yuokada/dotfiles

Conflicts:
	.zshrc