testing branch setup on cloud9

This commit is contained in:
Josh de Leeuw 2014-01-13 13:37:37 -05:00
parent f74752a23f
commit 0c2fdbd2e8

View File

@ -15,6 +15,8 @@
* timing_post_trial: how long to show a blank screen after the trial in ms.
* prompt: optional HTML string to display while the animation is playing
* data: optional data object
*
* testing branch setup
*/