break for lunch, working on user model & acceptance tests
Update users.json
resolving conflict