Handled readme conflict
Rename HAL specific hardware modules.
Improve dialog box resizing.
Attempt to resolve some NI errors by giving tasks different names.
Add LED light.
Change to return True/False for success or failure of setWaveform().
Change to make multiple attempts to create the NI task in the event of failure.
Log DAQ failures.
Merge branch 'master' into storm3
Update storm4pi setup.
Fix camera object check.
Get spot counter to work for two cameras. Add spot counter and progressions to the storm4pi setup.
Modification to startFilm in focusLockDualCam
Merge branch 'ZhuangLab-master'
Added pause to dave actions
Dave can now add pause actions
Merge branch 'master' into storm3
Added xml-requested pause to Dave
Handled README conflict
Added .gitattributes to address README conflicts