new blog and author page templates
finishing merge
I screwed up this branch