commit before pulling broken page
prose config stuff
main logo added
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-12-21-fourth-post.markdown