Vimrc
first Commit
Hey there
Merge https://github.com/txderosa/vimrc
hello.txt
Merge branch 'master' of https://github.com/txderosa/vimrc

Conflicts:
	hello.txt