add my old template back in
could need this..
Merge remote-tracking branch 'origin/component/blog' into component/blog

Conflicts:
	src/me/arrdem/blog/views/common.clj
Merge remote-tracking branch 'origin/component/core' into component/core
Merge branch 'component/blog' into develop
Merge remote-tracking branch 'origin/develop' into develop