pulling
Merge branch 'master' of github.com:eddition/Viddy-O
overwriting the sync method with datatype