a
Merge branch 'master' of https://github.com/ulrikmoe/kortgebyr

Conflicts:
	kortgebyr.js
a