fyrsta kommentid mitt
Merge branch 'master' of https://github.com/haftor24/INTOPrufa

Conflicts:
	NIM.cpp
Merge branch 'master' of https://github.com/haftor24/INTOPrufa

Conflicts:
	NIM.cpp