Merge pull request #51 from indotek68/master

Cals In
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
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
sites/show update
Merge pull request #58 from maiahariton/master

sites/show update
route for login in sites/index
Merge pull request #60 from maiahariton/master

route for login in sites/index
fixed carousel and bottom white space
added typhoeus
Merge pull request #61 from maiahariton/master

fixed carousel and bottom white space
sites/index and sites/show work perfectly with links
Merge pull request #62 from maiahariton/master

sites/index and sites/show work perfectly with links
merge conflict resolved
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev