Changed default font to Inconsolata-12
Merge branch 'master' of github.com:alexmsmartins/dotfiles

Conflicts:
	emacs