Added the data extraction library
removed main.css from index.php
Fixed merging issues
Merge remote-tracking branch 'origin/jon' into nchaney
Dealt with conflicts
Removed basins controls and GMinterface.php