Added a start for the testDetermineSwipe test in rectangleGeometryTest
Removing static variables already defined in Geometry from RectangleGeometry.

Merge branch 'master' of https://github.com/Fingerpaint/project-code

Conflicts:
	fingerpaint/application/src/nl/tue/fingerpaint/client/RectangleGeometry.java
	fingerpaint/application/test/src/nl/tue/fingerpaint/client/RectangleGeometryTest.java
Code for story 19: 'user can clear the current settings of the mixing protocol'added
Functionality of the 'define protocol' checkbox added. Also added the 'Mix Now' button, which calls the method 'executeMixingRun' that should be implemented later on.
refactored geometry/mixer enums to uppercase names
Created a reset button that clears the canvas
solved merge conflict
Merge branch 'master' of https://github.com/Fingerpaint/project-code
refactored file name, aka delete according to git
Created 'save results' and 'remove saved results' buttons without functionality
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Resolved merge conflict