more ignores and TODOs
Merge branch 'master' of github.com:samhile/QTLab
Merge branch 'driver-dev'
commiting initial changes to frontpanel
Updated TODO file

They are now in the driver-dev branch
updating ignore
Merge branch 'master' of github.com:samhile/QTLab
fixed up frontpanel for MultiLineEntries
fixing up logging in GUI windows.
Merge branch 'WatchWindowDev'

Conflicts:
	.gitignore
Added GPIB entry to create pane in the control window
fixed logic error in last commit
Add HDF5 data class (Wolfgang)
Add possibility for different visa drivers and unfinished/tested prologix Ethernet driver
Better handling of gnuplot closing
ObjectSharer fixes
added patches by Reinier.
Always enable stop button
Updates to lib/measurement.py
I dont know what I am doing, sam told me to do this.