my commit
Merge branch 'master' of https://github.com/birkir13/INTOPrufa

Conflicts:
	NIM.cpp
Helgi lina 60