Few changes
Merge branch 'master' of github.com:blegat/LINGI1113

Conflicts:
	minix/rapport/main.tex