Playing around with console log, stashing changes for Logan's pull request 22
Merge remote-tracking branch 'origin' into sync_vid
First go at syncing videos. Works for the most part, but a little buggy.
Merge branch 'master' into sync_vid
Merge branch 'master' into sync_vid
Merge branch 'master' into sync_vid
Fixed merge conflict in schema
Merge pull request #26 from Diasporism/sync_vid

Sync vid