1 jasmine test
merged
Merge branch 'master' into jasmine_testing
Merge branch 'favorite_recipes' into jasmine_testing
centered the add to favorites button and fixed the default img url with a migration
the new migration is now included
added kaminari gem to paginate search results
got pagination to work, now have 9 per page
finished styling the search result pagination bar
1 passing jasmine test
Merge pull request #48 from fiery-skippers-2014/paginate

Paginate
Merge branch 'paginate' into jasmine_testing
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem into jasmine_testing
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem into favorite_stile

so that i can continue on styling
made an admin page all tests pass
favorites page now fully styled with pagination
Merge pull request #50 from fiery-skippers-2014/admin

Admin
fixing merge conflicts
done with styling the favorites page it includes pagination
Merge pull request #51 from fiery-skippers-2014/favorite_stile

Favorite stile