My first git commit
Merge branch 'master' of github.com:haftor24/INTOPrufa

Conflicts:
	NIM.cpp