fix objc snippets
fixed conflict
Merge branch 'master' of github.com:f-kubotar/dotfiles
add golang
add go smatcher
fixed conflict