Added Codeforces' Dima and Salad.
Added omegaUp's Mocha Hojas.
Merged upstream.