pulling User into develop

updating functionality of the User class