lab5 done
lab 5
lab5
Merge branch 'master' of github.com:alexandernajafi/skolan

Conflicts:
	edaa01/.metadata/.log
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	edaa01/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	edaa01/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps