edit chilie recipe
Merge remote-tracking branch origin/master