fixed block structure, block announcement and adjusted task presentation times
Merge branch 'master' of https://github.com/jakobkolb/fMRI_FF