pictures changed
'merging'
Merge branch 'symposium' of https://github.com/jgblight/fydp into symposium
text and window size fixed
Merge branch 'symposium' of github.com:jgblight/fydp into symposium
autocalibrate added to demo 1
both demos updated to have countdown and optional autocalibration
some stuff
Merge branch 'symposium' of github.com:jgblight/fydp into symposium
project as of symposium
project as of symposium
unimportant things
conflict
I think I added a space by accident
Merge pull request #1 from jgblight/symposium

Symposium