Antes del commit
Merge branch 'master' into Story-line-&-image-adjustment