vim-emblem
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
Merge branch 'master' into hyfn