heroku
removed some unecessary files
trying to delete the tmp files and not see them again
Merge pull request #10 from fiery-skippers-2014/recipes

added more folders/files to git ignore
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem into api_testing
merged api_testing and master
able to parse a recipe id from json
able to append the recipe_id to the end of our recipe_url
able to retrieve the image_url from json object
Merge pull request #11 from fiery-skippers-2014/api_testing

Api testing
merge conflicts
created ingredients migration
switching branches
ingredient rake task file completed
model tests written for ingredients
fixed spelling error for recipes controller and now passing ingredients model tests
fixed merge conflicts when merging with master
Set up a basic html and css framework for Britt to work on later
Merge pull request #12 from fiery-skippers-2014/seed_ingredients

Seed ingredients looks great!
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem