fixed the addUser so that the password doesn't need to be sent through a
JSON document, and is instead pulled as a string from the user JSON
document
fixed conflicts with Shane.