Some changes.
Did some commenting.
Test commit.
Test 2
Merge branch 'old-state'

Conflicts:
	.vimrc
Added .vim folder.