SEM_control 1V18
Merge https://github.com/MJBradshaw/sem_control

Conflicts:
	pyNIDAQ.py
	pyNIDAQ_testing.py