adding users and signup for site
Merge conflicts