Merge pull request #1 from BU-ZY/places

Places
Merge pull request #2 from BU-ZY/places

Places
merge
Merge branch 'master' of https://github.com/BU-ZY/buzy
Merge branch 'master' into places
hi