working on video syncing
Merge branch 'master' of github.com:shulinj/cinemanet

Conflicts:
	views/watch.ejs
Merge branch 'master' of github.com:shulinj/cinemanet
watch.ejs syncs with some delay when new viewer joins
added attempt to sync on watch.ejs (does not work)
Merge branch 'master' of github.com:shulinj/cinemanet
Merge branch 'master' of github.com:shulinj/cinemanet
Merge branch 'master' of github.com:shulinj/cinemanet
reverted changes to watch.ejs
Merge branch 'master' of github.com:shulinj/cinemanet
Merge branch 'master' of github.com:shulinj/cinemanet