.tmux.confの変更
Merge branch 'note_pc' of github.com:TKNGUE/dotfiles into note_pc
Merge前コミット
Merge branch 'note_pc' of github.com:TKNGUE/dotfiles into note_pc

Conflicts:
	.vimrc
	.zshrc
	vimfiles/conf.d/basic.vim
	vimfiles/conf.d/bundle/bundle-editor.vim
	vimfiles/conf.d/bundle/bundle-util.vim
マージ前, コミット
Merge branch 'note_pc' of github.com:TKNGUE/dotfiles into note_pc

Conflicts:
	vimfiles/conf.d/bundle/bundle-programming.vim
Merge branch 'note_pc' of github.com:TKNGUE/dotfiles into note_pc
javascript系のプラグインの追加
bundle-utilの追加

easymotion : this is wondeful plugin
repeat.vim : surroundの繰り返し等. 改良してみたいところ
note_pc更新