removed table/model Restaurants
dropped table/model Places
created a Place model and Place controller
fixed migration conflict for places model and controller
merged with kirby's style
deleted restaurants model and views
api call working again in rails. changed places controller and places/index.html.erb
Merge branch 'master' of https://github.com/vassilevamartina/yelp-test
Merge branch 'master' into martina
Merge pull request #6 from vassilevamartina/kirby

amazon s3 integration
minor edit to force a commit
added ruby version to gemfile and added a procfile
unicorn added
did a bundle
add .env to .gitignore
added Procfile
env fingers crossed
styled places index page
styled places index page and merged with kirbs
Merge branch 'master' of https://github.com/vassilevamartina/yelp-test