add bugs fix
add new function
Merge branch 'newfunction'
add usb lock
add disableusb.txt
add testlab.txt
123123123
add new1
add firefox.txt
Merge branch 'firefox'
fix chrome bugs ok
Merge branch 'fixchromebugs'
Fix Chrome Bugs
Master Chrome Fix
Merge branch 'fixchrome'

Conflicts:
	chrome.txt
Master 123
branch 123
123
Merge branch 'fix123'

Conflicts:
	123.txt