CSP1150 A1: added HitViewerColour class
CSP1150 A1: fixed javadocs
CSP1150 A1: added getters/setters for annulus calculator in view
CSP1150 A1: finished gui, moving on to controller
CSP1150 A1: added listeners and controller, getting nullpointer exception
Merge branch 'rewrite'