Change logo to picture
Rename sitebuilder to blog.py
Fix conflicts