Merge branch 'views'
Merge branch 'master' of https://github.com/shrutijalewar/white-van
fixed video bug with navbar
Merge branch 'master' of https://github.com/shrutijalewar/white-van
Merge branch 'views'
Merge pull request #33 from shrutijalewar/views

navbar bug
bug fix in message.jade, deleted random npm log that wound up in views dir and controller dir
Merge pull request #34 from shrutijalewar/views

bug fix in message.jade, deleted random npm log that wound up in views d...
message.jade merge conflict resolved