Modified the readme file.
Added a .gitignore file.
Created the file conflicts-generator.
Added some text from http://git-scm.com/book/fr/ to the file conflicts-generator.
Added the file conflicts-generator.txt (same content as the file conflicts-generator).
Added documentation for the "crash course" (in french).