hej
Fixed README merge.conflict
Merge branch 'master' of https://github.com/pbl/EDAF05