first prototype
first prototype
Merge branch 'master' of https://github.com/ghguy/2share

Conflicts:
	public/index.html
	webm.js