Refactored geometry for extensibility
Refactored MixingStep and Protocol
Further fixed stuff
Merge branch 'master' of github.com:Fingerpaint/project-code
Fixed problem with simulating