Renemed AOI21.doc to .docx, improved formatting.
Merge branch 'fix_AOI'

Conflicts:
	lab2/AOI21/AOI21.docx