fixing the merges
Merge branch 'master' of https://github.com/paulcox24/whatsgood
Merge branch 'master' of https://github.com/paulcox24/whatsgood
added stuff, maps are slightly more bettah, needs moar work
Merge branch 'master' of https://github.com/paulcox24/whatsgood
solved merge conflicts in static controller
movedto isotope and installed imagesloaded
Merge pull request #48 from djmrr/mike/mapinteractive_redo

Mike/mapinteractive redo
Merge pull request #49 from derekdapp/derek/isotope

derek/ISOTOPE
Changed default city back to salt lake
detects when bottom of page is hit
nope
Favorite button ajaxed
got cats
Unfavorite buttn ajaxed
Merge pull request #50 from paulcox24/Favorites

Favorites
Description click moves cards, default event image
Default image saves on favorite
ajax is starting
Styled sign up sheet