documantation
Merge branch 'master' of https://github.com/plibin-vub/WIS-project

Conflicts:
	deliverables/report.docx
deliverables + zip