Added Password Error Check to setPassword
Merge branch 'master' of https://github.com/Coraellation/Scrib-curity-Bot

Conflicts:
	GUI.py