2nd commit, done too much without commiting, oops
Merge branch 'master' of https://github.com/jb7815/simple-blog