button styling logo and icons for top bar
resolve merge conflict
favorite view changes
Merge pull request #50 from purple-martins-2013/favorites_partial

favorite view changes
change color to softer yellow
Merge pull request #51 from purple-martins-2013/change-logo-color

change color to softer yellow
Merge branch 'master' into create-recipes
ingredient fixes