WIP draw on data
Merge branch 'popTrajSet' of github.com:djoshea/trial-data into popTrajSet

Conflicts:
	TrialDataConditionAlign.m