blø
new

Conflicts:
	Project1/Soner.cpp
fix