adding all this stuff
Merge branch 'master' of https://github.com/dannyfreeman/CrappyBlog