Trying to merge things
Merge branch 'master' of https://github.com/bIgBV/my-ramblings

Conflicts:
	blog_templates/blog.html
	blog_templates/blogbase.html
	static/main.css
Added a homepage and fixed the permalink issue