1.add my conf1.add my conf1.add my conf1.add my conf1.add my conf1.add
my conf1.add my conf1.add my conf1.add my conf1.add my conf1.add my
conf
Merge branch 'master' of https://github.com/Roxas/dot-vimrc