im confused#31

Open

trporter wants to merge 5 commits intoCodeCoreYVR:masterfrom

conceivably:master

Commits on Apr 29, 2016

add calorie_count method
tkbeili
committed

Commits on Jun 30, 2016

Update cookie.rb
conceivably
authored
Merge pull request #1 from conceivably/add_calorie_count_method
conceivably
authored
made a test change

david
authored and
david
committed
Merge branch 'add_calorie_count_method'

david
authored and
david
committed