first commit
Initial commit
Merge branch 'master' of https://github.com/frankd0331/vimrc
another commit just starting with git
Merge branch 'master' of https://github.com/frankd0331/dotfiles

Conflicts:
	README.md

so I guess I just deleted README.md idk, if that helps?