plan diapo
Merge branch 'master' of https://github.com/AmarOk1412/TIPEAPS

Conflicts:
	Diapo/Diapo.log
	Diapo/Diapo.pdf
	Diapo/Diapo.synctex.gz
	Diapo/Diapo.tex