changed package json
Merge branch 'master' of https://github.com/zoeames/Vichan
merge conflict
Merge branch 'master' of https://github.com/zoeames/Vichan
Merge branch 'master' of https://github.com/zoeames/Vichan
Merge branch 'master' of https://github.com/zoeames/Vichan
user displaying
db script updated
nav buttons added
users page set up
users page set up
front end branch merged
merged with master
webcam merged to master
Merge branch 'master' of https://github.com/zoeames/Vichan
webcam bug fixed
added logo to nav bar and added to index less file
Merge pull request #2 from zoeames/logoSP2

Logo sp2
added img to home page
Merge pull request #3 from zoeames/imgHomeSP

added img to home page