Merge branch 'master' of https://github.com/berkeleyjess/CDIPSDSW

Conflicts:
	Classes/readTutorData.py
Merge branch 'master' of https://github.com/berkeleyjess/CDIPSDSW

Conflicts:
	Classes/readTutorData.py
	PlottingScripts/histogramSubjectsPerTutor.py
Got rid of some git stuff at the end.