added eol_fix.vim
Merge remote branch 'origin/master'