fix merge conflicts between fatsecret and master
delete duplicate root_path
Added food show page with serving size and qty selection
fix merge conflict
adding searched foods to Foods table
fix merge conflicts
delete cassettes to pass tests
merge master with fatsecret branch
fixed tests, corrected VCR issues
fix merge conflicts
Merge pull request #8 from Egogre/fatsecret

Fatsecret