Nu kann eg ad gera git commit
Merge branch 'master' of https://github.com/sverrirps/INTOPrufa

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