...
Merge branch 'master' of github.com:virgiliosanz/dot_files

Conflicts:
	.emacs.d/init.el
	.vimrc