merge branches
had to change input field for email to text as it would not accept phonenum