temp
Merge branch 'master' of https://github.com/smartcrib/password-scrambler-ws

Conflicts:
	sCribManager/Dongle.py