Reduced margins, so the example will fit on small screens.
Merge remote-tracking branch 'origin/master'