fixing catch trials
intersperse catch trials with critical trials
Merge remote-tracking branch 'upstream/master'
merge with original repo
got change trials working, fixed formatting issues
Merge pull request #2 from wbushong/master

Erin--please merge again :)