Added all my old blog posts from Django site
fixed conflicts