Merge branch 'master' of https://github.com/osamu2001/.emacs.d
add yasnippet