add golang
Merge branch 'master' of github.com:masahide/dotfiles

Conflicts:
	.vimrc