basic layout
Merge branch 'master' of https://github.com/dpressey/my_blog