fixed wrong block inheritance (block 7 had block 6 trials), added lineheight to instructions
Merge branch 'master' of https://github.com/ProjectImplicit/PIPlayer