imdisp.py is able to read and display image files using python-openCV
Merge branch 'master' of https://github.com/ChasNelson1990/laircam

Conflicts:
	src/hello.py