Initial commit
.vimrc
Various things
blah
.gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore