SOLVED CONFLICTZZZZZzzzzZZZZzzzzZZZZzzzzZZZzz

Conflicts:
	TSBK03_Project/TSBK03_Project.depend
	TSBK03_Project/TSBK03_Project.layout
	TSBK03_Project/obj/Debug/openoliver/openoliver/main.o
	include/ClothSimulation.h
	openoliver/openoliver/src/ModelObject.cpp
	src/ClothSimulation.cpp
	src/KeyMouseHandler.cpp