Merge branch 'master' of https://github.com/Sqozz/glowing-bear

Conflicts:
	css/glowingbear.css
Revert to b05b69f