Changes made
Merge branch 'master' of https://github.com/Wimsy113/wimsy113.github.io

Conflicts:
	blog-stylesheet.css
	blog-template.html