Bigger font for emacs
Merge remote branch 'origin/master'