not quite sure
not quite sure
updates sign up form and adds current user first name/edit link to nav bar
fixes conflicts