CoNFLICT?!?!
Merge branch 'master' of github.com:matslindh/detdigitaleselskab

Conflicts:
	README.md