Masse Nytt!!!
Conflict fix

Conflicts:
	Project1/Eiendom.cpp
	Project1/SONE001.DTA
	Project1/Sone.cpp
	Project1/Soner.cpp