Fixing some stuff, and writing own text

diff --cc mostimportant.py
Simple merge

diff --cc rapport.aux
Simple merge

diff --cc rapport.dvi
Simple merge

diff --cc rapport.log
Simple merge

diff --cc rapport.pdf
Simple merge

diff --cc rapport.ps
Simple merge

diff --cc rapport.tex
Simple merge

diff --cc simulate.py
Simple merge