Just pulling

Merge branch 'master' of https://github.com/z3ss/BFST

Conflicts:
	ProjectPart1/src/SearchEngine/SearchLabel.java
	ProjectPart1/src/ctrl/KL.java
	ProjectPart1/src/view/Canvas.java
Just pulling

Merge branch 'master' of https://github.com/z3ss/BFST

Conflicts:
	ProjectPart1/src/SearchEngine/SearchLabel.java
	ProjectPart1/src/ctrl/KL.java
	ProjectPart1/src/view/Canvas.java
Merge branch 'master' of https://github.com/z3ss/BFST

Conflicts:
	ProjectPart1/src/ctrl/KL.java