11
Merge branch 'master' of https://github.com/fion45/webCapture

Conflicts:
	DBScript/insertValue.sql