init
a
c'
q
 a
 a
jslj
8.25
	modified:   .vimrc
	modified:   .vimrc
	modified:   .vimrc.bundles
Merge branch 'master' of https://github.com/812lcl/.812lcl-vim

Conflicts:
	.vimrc
	.vimrc.bundles
	bootstrap.sh