New readme.txt
Merge branch 'master' of github.com:QrshR/inf1060-he

Conflicts:
	readme.txt