Revert "move demo files to a separate branch"

add teapot to demo branch

This reverts commit cdbc713bba6913a22ba22ebaef935a1b2b1bb34a.
don't be a library
bring demo up to date