Back to bigger fonts. My new laptops have too much resolution
Merge branch 'master' of github.com:inffcs00/emacs_conf

Conflicts:
	.emacs.d/linux.el