yes
Merge branch 'master' of https://github.com/Ryan5231/hood into realtor
realtor path
resolved conflict in votes table