Merge pull request #1 from BU-ZY/places

Places
Merge branch 'master' of https://github.com/BU-ZY/buzy
Merge pull request #2 from BU-ZY/places

Places
merge
Merge branch 'master' of https://github.com/BU-ZY/buzy
fixing merge conflicts
Merge branch 'master' of https://github.com/BU-ZY/buzy

Conflicts:
	db/schema.rb
Add/fix styling
Merge branch 'master' into places
hi
votes are working
merge conflicts
something is fucked up
Merge branch 'master' of https://github.com/BU-ZY/buzy
head mistake
kanav's changes
votes drop down weird stuff
working on showing votes
Merge branch 'places'
Merge branch 'master' of https://github.com/BU-ZY/buzy