Attempting to solve stash conflict
Resolved stash conflict
Added test cases for the swiping to add a mixing step
Merge branch 'master' of https://github.com/Fingerpaint/project-code