.gitignore
Updated workspace
test socket page
Modules
Merge branch 'master' of https://github.com/Rob-pw/Capture

Conflicts:
	.gitignore