Merge remote-tracking branch 'upstream/master'
Add dual mouse button for colours. Left button does left colour and right button does right colour. All tools and ColourChooser.
Merge branch 'master' of https://github.com/markbernard/Paint.JAVA into markbernard-master
fixing conflicts
merged two-colour option