Adding missing files.
Merge branch 'master' of github.com:flowgrammable/freeflow into t-wynn/examples
fixed merge conflicts