Changed the font size to 12.
Merge branch 'master' of github.com:grayhemp/emacs-configuration

Conflicts:
	general.el