Aufgabe 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	03/.DS_Store
	03/Blatt3/src/main/Bubblesort.java
	03/Blatt3/src/main/Insertionsort.java
	03/Blatt3/src/main/Main.java
	03/Blatt3/src/main/Main.java~
	03/Blatt3/src/main/Quicksort.java
	03/SortAlgos/.classpath
	03/SortAlgos/.gitignore
	03/SortAlgos/.project
	03/SortAlgos/.settings/org.eclipse.core.resources.prefs
	03/SortAlgos/.settings/org.eclipse.jdt.core.prefs
	03/SortAlgos/src/main/Bubblesort.java
	03/SortAlgos/src/main/Insertionsort.java
	03/SortAlgos/src/main/Main.java
	03/SortAlgos/src/main/Main.java~
	03/SortAlgos/src/main/Quicksort3.java