linker error
Merge branch 'master' of https://github.com/TomaszAugustyn/CollisionDetectionMessorII

Conflicts:
	CMakeLists.txt
	main.cpp
	src/CollisionDetection/3dsloader.cpp