updated
Merge branch 'master' of github.com:emmashavick/jog_blog2

Conflicts:
	CNAME