cleaned up main
working preview
Merge branch 'master' of github.com:eddition/Viddy-O