Ny eiendom testing
Conflict fix

Conflicts:
	Project1/Soner.cpp