aa
Merge remote-tracking branch 'origin/NB' into PC
aa
Merge remote-tracking branch 'origin/NB' into PC

Conflicts:
	vimrc
remove auto-pair plugin
add auto-pair

add a trick for auto formatting text
modify vimrc
modify colorscheme
Merge remote-tracking branch 'origin/PC' into NB

Conflicts:
	colors/vividchalk.vim