Changed odor on duration to 1.8s
Merge branch 'master' of github.com:youlilly/olfactory_fmri_script

Conflicts:
	OCF_Conditioning_mritest.m
	OCF_postCond_mritest.m
	OCF_preCond_mritest.m
Revert conditioning file
Revert "Changed odor on duration to 1.8s"

This reverts commit 2338b6f5529ec9e8d57aefe0c6a74b7ce03b026e.

Conflicts:
	OCF_Conditioning_mritest.m
	OCF_postCond_mritest.m
	OCF_preCond_mritest.m
Revert "Merge branch 'master' of github.com:youlilly/olfactory_fmri_script"

This reverts commit 2338b6f5529ec9e8d57aefe0c6a74b7ce03b026e.

Conflicts:
	OCF_Conditioning_mritest.m
	OCF_postCond_mritest.m
	OCF_preCond_mritest.m