use size 10 font
Merge branch 'master' of https://github.com/jschaf/dotemacs

Conflicts:
	init.el