Fixed display code
Merge branch 'master' of https://github.com/wadelab/flyCode

Conflicts:
	collectData/flyTV/flytv_plaidShuffle3.m