edited models.js
Merge branch 'master' of github.com:eddition/Viddy-O
editedmain js
conflicts resolved
added styling