read me
manual merge
Merge branch 'master' of https://github.com/shrutijalewar/white-van
Merge branch 'views'
Merge branch 'master' of https://github.com/shrutijalewar/white-van
Merge pull request #31 from shrutijalewar/views

Video
fixed video bug with navbar
users can now break up with one another
Merge pull request #32 from shrutijalewar/backend-setup

users can now break up with one another
Merge branch 'master' of https://github.com/shrutijalewar/white-van
Merge branch 'views'