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

Conflicts:
	logo/.DS_Store
k