personalized
Merge remote-tracking branch 'local/master'

Conflicts:
	vimrc
changed readme to my needs