Last changes
Merge branch 'master' of https://github.com/JulesWulms/database-technology

Conflicts:
	Report 1/report.pdf