add golang
Merge remote-tracking branch 'origin/master'
]でのペーストを無効に
Merge branch 'master' of github.com:masahide/dotfiles

Conflicts:
	.vimrc