WEBSHARE Framework
Merge branch 'master' of github.com:explodes/sock-share

Conflicts:
	.gitignore