merge conflict resolved
merge conflict resolved
merge conflict resolved
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
merge conflict resolved
merge conflict
added cal info
Merge pull request #51 from indotek68/master

Cals In
added yummly ENV keys
index and show pages
Merge pull request #52 from indotek68/master

added yummly ENV keys
Merge pull request #53 from maiahariton/master

index and show pages
added styling
Merge pull request #54 from indotek68/master

added styling to show
moved gon for whitespace
fixed doubled links
fixed million lines
Merge pull request #57 from Rakulon/master

Ok -6000 lines
fixed merge conflicts and added user authentication