Testfunktion
Merge branch 'master' of https://github.com/SortC/SortC-Model

Conflicts:
	SortCModel/Model/Model.cpp
	SortCModel/SortCModel.sdf