last changes
Merge branch 'master' of https://github.com/Shiroy/HE01_expose

Conflicts:
	presentation.pdf