added video implementation untested
testing videos
added video implementation untested
testing videos
fixed merge errors
Merge pull request #19 from jimgong92/master

Refactored
video publisher doesn't show own sometimes
videos semi-working
Merge pull request #20 from jimgong92/master

Vaguely hacky
Finishes socket connection
Fixes login bug
Updates on socket and styling on index.html and about.html
Merge pull request #21 from sgenyk91/master

Jimmy + Stephan code
fixing
working vids?
Merge pull request #22 from caro5/master

video stuff added
menu changes
Merge pull request #23 from floofydoug/master

menu changes
commented out some of carolines code. using ip address
Merge pull request #24 from floofydoug/master

Allows external cameras to connect