changed car detector
Merge branch 'master' of https://github.com/robinschnetler/COS301_AutoMart into rectangles
Modified colour detector to also return hex values
Merge branch 'master' of https://github.com/robinschnetler/COS301_AutoMart into rectangles
updated blurDetection algorithm
fixed merge conflicts
saved imageBlock
unit testing and colour updated
fixed merge conflicts