add gitmodule
aa
aa
merge with master
Merge remote-tracking branch 'origin/master' into PC

Conflicts:
	.gitmodules
	vimrc
delete .pyc