documentation added
readme conflicts resolved
Merge branch 'master' of github.com:eddition/Viddy-O