Resolved stash conflict
Removed class files (hopefully)
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Removed redundant comments
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Adding a mixing step now correctly uses the step size set in the setStepSize Spinner
Resolved merge conflict