edits
Merge branch 'new_plots' of github.com:RafiKueng/SimAnalysis into new_plots