Merge branch 'sheeeebaaaannnng' into 'master'

shheeebbaaaannngg

See merge request picasoft/formations/A18/tp-v2!1

init.sh

-#/bin/bash
+#!/bin/sh
 git checkout merge_simple
 git checkout merge_conflit
 git checkout rebase_simple