On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

modified:   ../Gemfile
modified:   ../app/controllers/properties_controller.rb
modified:   ../app/models/landlord.rb
modified:   ../app/models/property.rb
modified:   ../app/views/properties/_form.html.erb
modified:   ../app/views/properties/show.html.erb
modified:   ../config/routes.rb
deleted:    ../db/migrate/20140701042902_remove_price_from_properties.rb
deleted:    ../db/migrate/20140701042945_remove_rent_from_properties.rb
new file:   ../db/migrate/20140715010825_add_landlord_id_to_properties.rb
deleted:    ../db/migrate/20140715010825_add_landlords_id_to_properties.rb
modified:   ../db/schema.rb