add a few things/sync setup
Merge branch 'master' of https://github.com/sherah/prototypes