Adnen
Merge resolved

Conflicts:
	Main.tex