Put ls file?.txt and ls file??.txt example into a separate code box.
Merge remote-tracking branch 'camille/gh-pages' into gh-pages
Resolved so-called conflict
.