some stuff
Merge branch 'symposium' of github.com:jgblight/fydp into symposium
project as of symposium
project as of symposium