oop
the day's hacking
Merge branch 'domeathon' of https://github.com/pjb304/rtiacquire into pjb304-domeathon

Conflicts:
	rtiacquire/preview.py