new plots are in plots
Merge branch 'master' of https://github.com/BrendanBenshoof/CHRONUS

Conflicts:
	CHRONUS/CODE/plots/plotter.py