added start of a mixing step test
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Merge branch 'master' of https://github.com/Fingerpaint/project-code
Finished the rectangleGeometry test, made a test for Colour and made the padding function in colour static

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

Conflicts:
	fingerpaint/test/src/nl/tue/fingerpaint/client/model/RectangleGeometryTest.java
Merge branch 'master' of https://github.com/Fingerpaint/project-code