latest code Merge branch 'ethan-dev' of github.com:googleinterns/SmallCity into ethan-dev
latest code
Merge branch 'ethan-dev' of github.com:googleinterns/SmallCity into ethan-dev

googleinterns/SmallCity,googleinterns/SmallCity,googleinterns/SmallCity