cloth simulation
cloth simulation
merge conflicts
Merge branch 'master' of https://github.com/kleinab/final_project837
merge2
Merge branch 'master' of https://github.com/kleinab/final_project837

Conflicts:
	a3
	debug/a3
	debug/libvecmath.a
	obj/Debug/ClothSystem.o
	obj/Debug/Joint.o
	obj/Debug/MatrixStack.o
	obj/Debug/SkeletalModel.o
	obj/Debug/SkeletonMesh.o
	obj/Debug/SphereSystem.o
	obj/Debug/main.o
	obj/Debug/particleSystem.o