added basic testing outline for reference
Merge pull request #81 from billbindi/master

Shell of configuration object in model
Merge pull request #76 from drew212/master

Testing basic template
Merge pull request #85 from billbindi/master

Add more generality in hydromap file location
un csv related, but i believe i fixed the black images.
adding carbon image
Merge branch 'addCVS'

Conflicts:
	main/model/color.cpp
added carbon images
Making changes needed to compile on QT5.  Please upgrade your SDKs.
Merge pull request #88 from eparsons/master

Changes needed to compile as a QT5 project
Moving data directory out of model directory and into the project root.
Modifying file locations in non-gui version to match new expected location.
Merge branch 'master' of github.com:eparsons/USGS2012
Merge branch 'master' of git://github.com/SeniorProjects-CS-Illinois/USGS2012
Merge pull request #89 from eparsons/master

Moving data directory to project root.
Merge branch 'master' of git://github.com/SeniorProjects-CS-Illinois/USGS2012
Black pictures caused by NaN value, also added csv for average carbon
Merge pull request #87 from gelo592/master

Carbon Images
Allow for average stock image to be displayed.