finished email verification functionality
fixed merge conflicts