Added more text wiieee
Added more text wohoo
using theirs
Merge branch 'master' of https://github.com/Dansel/inda13

Conflicts:
	rapport.tex