Merge branch 'master' of https://github.com/sparkofwildness/sparkofwildness.github.io

Conflicts:
	css/stylesheet.css
Merge branch 'master' of https://github.com/sparkofwildness/sparkofwildness.github.io

Conflicts:
	css/stylesheet.css