Adding Walter to our list of users
Fixed merge conflict for Users.txt