added ROI features
merging home to work

Merge branch 'master' of https://github.com/DawesLab/PythonForPicam