Merge branch 'master' of github.com:SeniorProjects-CS-Illinois/USGS2012
Merge branch 'master' of github.com:SeniorProjects-CS-Illinois/USGS2012
Beginnings of hydromap class
Merge branch 'master' of github.com:SeniorProjects-CS-Illinois/USGS2012
Added go functions to CL kernel
RiverModel.cl now using globals struct
Merge branch 'master' into hydrofiles
Merge branch 'hydrofiles' of github.com:eparsons/USGS2012 into HydroFileMap
HydroFile class header is mostly complete.
Merge branch 'hydrofiles' of github.com:eparsons/USGS2012 into HydroFileMap
Changes to header for mapping indices
Merge pull request #60 from gelo592/master

Removing cap on turbidity fixes # 34
Make configuration more OO style.
Replace QList with QVector.
Minor cleanup in GUI.
Merge branch 'master' of github.com:SeniorProjects-CS-Illinois/USGS2012
hydrofilemap implemented
Merge branch 'hydrofiles' of github.com:eparsons/USGS2012 into HydroFileMap
Merge pull request #63 from billbindi/master

Make configuration object follow OOP styles
Store configuration object in ui,
to be passed later to model.
Merge branch 'master' of github.com:SeniorProjects-CS-Illinois/USGS2012
Fix compiler error from previous commit.