Allowed client to change password without seeing his or her password in letters
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of /home/student/OneDir-Team13 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Admin.py
Allow user to not see his/her password as client when password is being changed