fixing the merges
Merge branch 'master' of https://github.com/paulcox24/whatsgood
Merge branch 'master' of https://github.com/paulcox24/whatsgood
Merge pull request #47 from paulcox24/Favorites

Favorites
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
Favorite button ajaxed