þetta er bara flott setti inn nafn og nick
Merge branch 'master' of https://www.github.com/Ottarinn/INTOPrufa

Conflicts:
	NIM.cpp
allt i graut