comment out vid stuff
Merge branch 'master' of https://github.com/TheFlock/FLOCK