User signup incomplete. user validation and tests
fix kevin's merge conflict