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
add daily food data for user
Merge pull request #9 from Egogre/food_views

add daily food data for user
update goals to include fiber
refactor Food create method
Merge pull request #10 from Egogre/separate_apps

refactor Food create method
resolved merge conflicts and removed @goal.save after @goal.update_attributes
tests passing for merge