read me
manual merge
Merge branch 'master' of https://github.com/shrutijalewar/white-van
fixed bug in index.jade which prints search query
Merge branch 'views'
Update README.md
Merge pull request #29 from shrutijalewar/backend-setup

Backend setup
Update README.md
Update README.md
Merge pull request #30 from shrutijalewar/views

Views
got the background video to work
tweaks
Merge pull request #31 from shrutijalewar/views

Video
Merge pull request #32 from shrutijalewar/backend-setup

users can now break up with one another
texting works for messaging and when shanked