Merge pull request #1 from ajjimenez/master

added egg yolk
fixing the calculate function call
Changed Javascript Logic