merge
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	vimrc