first commit
test first comment
sencond commit
Revert "test first comment"

This reverts commit 2bbb16e316aa82b10aca627e09aa17ed48fab1c8.

Conflicts:
	test.txt
bu
space
Revert "space"

This reverts commit 771a765218fd7b2d12e9947ae6bf1193263f6968.
Revert "bu"

This reverts commit 415fe5eb98bc4ea0b03a9835abe9a135b3858d98.
new
add set
vim/colors
add vim-twig
Merge remote-tracking branch 'dotfiles/master'