make teh passwords
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/create_password.php