solid box
Merge remote-tracking branch 'origin/master'

Conflicts:
	FluidSim/FluidSim/main.cpp