changes
Merge branch 'master' of github.com:miguelbermudez/dotfiles

Conflicts:
	.vimrc.after
changed font size