New Files
Merge branch 'master' of https://www.github.com/Cosmin1490/VIM

Conflicts:
	vimrc