Merge branch 'master' of https://github.com/crdschurch/crossroads.net

Conflicts:
	app/css/blog.scss