changed eol char
Merge branch 'master' of https://github.com/natemara/vimfiles

Conflicts:
	configs/look.vim