no message
Merge branch 'master' of https://github.com/granttimmerman/Narrative

Conflicts:
	layout/index.html
	public/css/styles.css
Merge branch 'master' of https://github.com/granttimmerman/Narrative