Breytti reglunum, Arnar vinnur alltaf
Merge branch 'master' of https://github.com/sverrirps/INTOPrufa

Conflicts:
	NIM.cpp