background image, top-bar color change, button colors
styling changes
logo to navbar and modal background change
forgot these images whoops
Merge pull request #45 from purple-martins-2013/final_styling

Final styling
config production db
fix references to images in assets
add user check so that ajax does not choke
Merge pull request #46 from purple-martins-2013/production-hotfixes

Production hotfixes
remove the pesky .DS_Storez
fix the overly bounciness of the badges (when changing page)
remove rendundant badge value update
Merge pull request #47 from purple-martins-2013/fix-overbouncing-of-badges

Fix overbouncing of badges
remove sortable functionality on favorites
refactor add_to_basket parameters and specs
refactor favorites into own class
remove acts_as_list
resolve merge conflict
Merge pull request #48 from purple-martins-2013/refactor-favorites

Refactor favorites