simple
余計なことしない！
Merge branch 'master' of github.com:mashiro/dot-files

Conflicts:
	.zshenv
update neobundle.vim