added the ability for users to change username
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Client.py
added the ability for users to change username