merge conflict
Merge branch 'master' of github.com:alexandernajafi/skolan

Conflicts:
	edaa01/.metadata/.log
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/banktest/.markers.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/banktest/.syncinfo.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab1/.markers.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab1/.syncinfo.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab2/.markers.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab2/.syncinfo.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab3/.markers.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab3/.syncinfo.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab4/.markers.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab4/.syncinfo.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab5/.markers.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab5/.syncinfo.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab6/.markers.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.projects/lab6/.syncinfo.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	edaa01/.metadata/.plugins/org.eclipse.core.resources/.snap
	edaa01/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	edaa01/.metadata/.plugins/org.eclipse.jdt.core/1431162455.index
	edaa01/.metadata/.plugins/org.eclipse.jdt.core/3141775227.index
	edaa01/.metadata/.plugins/org.eclipse.jdt.core/3408485364.index
	edaa01/.metadata/.plugins/org.eclipse.jdt.core/575340225.index
	edaa01/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	edaa01/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	edaa01/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	edaa01/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	edaa01/lab4/src/bst/BinarySearchTree.java