1 jasmine test
merged
Merge branch 'master' into jasmine_testing
Merge branch 'favorite_recipes' into jasmine_testing
1 passing jasmine test
Merge branch 'paginate' into jasmine_testing
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem into jasmine_testing
made an admin page all tests pass
Merge pull request #50 from fiery-skippers-2014/admin

Admin