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

Conflicts:
	.gitmodules
	bundle/vim-ipython
	colors/Tomorrow-Night-Bright.vim
	session/NavigationSystem.vim
	vimrc
aa
Merge branch 'PC' of https://github.com/frid/vim-config2 into PC
recompile YCM
Merge remote-tracking branch 'origin/PC' into NB

Conflicts:
	vimrc
add ycmd and easy align blugin

rearrange vimrc
add Chai3dTestFunction VC Project
Merge remote-tracking branch 'origin/NB' into PC

Conflicts:
	vimrc