Integrated improved mixingstep and new mixingprogram class in the project
Merge branch 'master' of https://github.com/Fingerpaint/project-code