Added front end to user registration
fixed merge conflicts