minor chane
Merge branch 'master' of https://github.com/spycom/videochat-dev

Conflicts:
	start.html
placing video
nothing