fiiiikt...
Merge branch 'master' of https://github.com/sbleika/Kklubburinn

Conflicts:
	site/Kokubankinn.html
	site/main.css