updated redeem, register, login
fixed merge conflicts, start branching here