signup form complete
fixed merged conflicts