Test
Merge branch 'master' of github.com:ekkodill/jalla

Conflicts:
	skriv.php
Merge branch 'master' of github.com:ekkodill/jalla

Conflicts:
	css/keyboard.css