trying to merge
pushing up
Merge branch 'master' of github.com:MarcGarreau/the_pivot into filter_listings_by_accommodations
Merge branch 'master' of github.com:MarcGarreau/the_pivot into filter_listings_by_accommodations
commit
rewriting JS, setting up base for filtering
Changes migration - description string to text
Updated schema with text description
Removes turbolinks to eliminate need for refreshing
adds filtering by bathroom, working on price
save work on current branch
OMG WE HAVE FILTERING BY DATES
Gnarly merge of javascript files
Listings pull in and display their associated photo
Merge branch 'master' of github.com:MarcGarreau/the_pivot into comparing_javascripts
Merge pull request #184 from MarcGarreau/comparing_javascripts

Let there be javascripts