7an
Merge branch 'master' of https://github.com/rn222cx/1DV404

Conflicts:
	1DV404_HT14_[grupp.B]_2_[rn222cx]/Uppgift-7.docx