user.json done
Merge branch 'master' of https://github.com/Bethhh/UCSDRentals