show edit delete for users, updated models
Merge branch 'master' of https://github.com/fanyin/cis196-hw0