cleaned up main.js
Merge branch 'master' of github.com:eddition/Viddy-O
edited welcome page
Merge branch 'master' of github.com:eddition/Viddy-O