working on favorites button
added non-functioning slider
working on code to pull full JSON object, all changes reverted to original
working on code to pull full JSON object, all changes reverted to original
reconciled merge conflict in map.js, added routes to file using annotate, reorganized elements on show page, created style classes for new elements on show page
reconciled merge conflict in map.js
removed debugger from map2, finished organizing detailed info in markets/show page, worked with css to properly align labels and data in box on markets/show page
refactored code for
displaying detailed market info on show page, reorered elements, chnaged css
fixed merge issues
slider
resolved merge conflicts
added slider, specified order that js files should load in, added custom sql to pull table of joined data
styling home page