update lab4
Merge branch 'master' of https://github.com/infiRD/IAS

Conflicts:
	lab4/workspace/.metadata/.log
	lab4/workspace/.metadata/.plugins/org.eclipse.cdt.core/.log
	lab4/workspace/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log
	lab4/workspace/.metadata/.plugins/org.eclipse.cdt.ui/lab4.build.log
	lab4/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/lab4/.indexes/history.index
	lab4/workspace/.metadata/.plugins/org.eclipse.core.resources/.root/25.tree
	lab4/workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	lab4/workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	lab4/workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	lab4/workspace/.metadata/version.ini