Minor Patch
Merge branch 'master' of https://github.com/aliceffekt/XXIIVV

Conflicts:
	inc/style.main.css