Add rock salt to chili-recipe
Merge remote-tracking branch 'origin master'