added usernames to users
manged merge conflicts