sublime text
vim
Merge branch 'master' of github.com:kek/config

Conflicts:
	sublime-text/User/Default (OSX).sublime-keymap
	vim/rc
submodule