merge conflicts
more mrg conflicts
mrgconfl
add blog page, change default font
Merge branch 'blogPage'