Added server functions changePassword, changePasswordAsAdmin, viewUserInfo to chun's push at the beginning of lab
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.py