modified gitconfig
modified gitconfig: add alias for 'git log'
modified gitconfig: add alias 'git tr'
modified gitconfig
modified gitconfig: add alias 'git tr'
Merge remote-tracking branch 'origin/winpc' into work/master
Merge branch 'work/master'

Conflicts:
	.gitconfig
modified comment of 'vimrc'
Update README.md
modified: vundle plugins
Merge branch 'feature/vimrc'
modified: name, alias for merge
Merge branch 'feature/gitconfig'
modified vimrc: neosnippet
renamed Colour-Sampler-Pack
add ignore pattern for NEARDTree
Remove gomi
Update .vimrc
Update .tmux.conf
Update .tmux.conf