Corrected WormGearGrind simulation
Merged stuff
Added color to show the results of our simulation
Merge branch 'master' of https://github.com/happah-graphics/happah.git
Merged Color ...
Conflicts:
	src/main/core/primitives/Color.h
	src/main/core/simulations/DiscGearGrind.cpp