Latest vignette update.
Moved to vignettes folder.
Moved to vignettes folder.
Fixed documentation for imports.
Fixed documentation for imports.
Fixed imports.
Added generalAxis help file
Removed silly functions.
Latest update to vignette.
Removing unused functions.
Latest build that passes checks.
post-merge commit

Merge remote-tracking branch 'canon_master/master'

Conflicts:
	DESCRIPTION
	R/dischargeLogAxis.R
	R/generalAxis.R
	R/plotFluxPred.R
	R/plotLogConcPred.R
	R/plotLogConcQ.R
	inst/doc/EGRET-figmultiPlotDataOverview.pdf
	inst/doc/EGRET-figplotConcQ.pdf
	inst/doc/EGRET-figplotConcTime.pdf
	inst/doc/EGRET-figplotFlowSingle.pdf
	inst/doc/EGRET-figplotFour.pdf
	inst/doc/EGRET-figplotFourStats.pdf
	inst/doc/EGRET-figplotLogConcTime.pdf
	inst/doc/EGRET-figplotLogFluxQ.pdf
	inst/doc/EGRET.pdf
	inst/doc/EGRET.synctex.gz
	inst/doc/Rplots.pdf
	man/generalAxis.Rd
	vignettes/EGRET-fig3a.pdf
	vignettes/EGRET-fig3b.pdf
	vignettes/EGRET-figBox2.pdf
	vignettes/EGRET-figboxConcMonth.pdf
	vignettes/EGRET-figboxQTwice.pdf
	vignettes/EGRET-figboxResidMonth.pdf
	vignettes/EGRET-figfluxBiasMulti.pdf
	vignettes/EGRET-figplotConcHist.pdf
	vignettes/EGRET-figplotConcPred.pdf
	vignettes/EGRET-figplotConcQSmooth.pdf
	vignettes/EGRET-figplotConcTimeDaily.pdf
	vignettes/EGRET-figplotConcTimeSmooth.pdf
	vignettes/EGRET-figplotContours.pdf
	vignettes/EGRET-figplotDiffContours.pdf
	vignettes/EGRET-figplotFluxHist.pdf
	vignettes/EGRET-figplotFluxPred.pdf
	vignettes/EGRET-figplotFluxTimeDaily.pdf
	vignettes/EGRET-figplotLogConcPred.pdf
	vignettes/EGRET-figplotLogConcQ.pdf
	vignettes/EGRET-figplotLogConcQSmooth.pdf
	vignettes/EGRET-figplotLogFluxPred.pdf
	vignettes/EGRET-figplotQTimeDaily.pdf
	vignettes/EGRET-figplotResidPred.pdf
	vignettes/EGRET-figplotResidQ.pdf
	vignettes/EGRET-figplotResidTime.pdf
	vignettes/EGRET-figplotSDLogQ.pdf
	vignettes/EGRET.log
mostly functioning code following merge
Got all functions behaving as they should