Adjusted font and CKEditor
Merge branch 'master' of https://github.com/granttimmerman/Narrative

Conflicts:
	public/css/styles.css
	views/home.hbs
	views/reading.hbs
Merge branch 'master' of https://github.com/granttimmerman/Narrative