Requirements and comments
Merge branch 'master' of https://github.com/pitakill/MyDotFiles

Conflicts:
	vimrc