Updated the files for the "crash course".
Resetted the conflicts-generator.txt file.
Merge branch 'master' of github.com:ClementGGuy/toyrepo
Deleted files from first session of the "crash-course".