:)
Merge branch 'master' of github.com:Melanie8/Stats_APP

Conflicts:
	rapport/appendix.tex
	rapport/quest2/quest2.tex