lab6 added
Merge branch 'master' of https://github.com/infiRD/IAS

Conflicts:
	lab6/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/28/10ce133c365b0014140dc31593009657