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

Conflicts:
	css/start1.css
	index.html
	start.html