opacity working better
progress on colourmap
code style
Merge branch 'develop' of https://github.com/ben-bougher/pickr into develop
added main.py back in..I lost it?