Complete signup
fixed merge signup
finished signup