Prufa...
Litabreytingar og svona.
Merge branch 'master' of https://github.com/sbleika/Kklubburinn

Conflicts:
	site/Kokubankinn.html
Merge branch 'master' of https://github.com/sbleika/Kklubburinn

Conflicts:
	site/Kokubankinn.html