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

Conflicts:
	stylesheets/stylesheet.css
Fixes.