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

Conflicts:
	ProjectPart1/src/ctrl/StartMap.java
Merge branch 'master' of https://github.com/z3ss/BFST
Final changes to project, javadoc missing
Merge branch 'master' of https://github.com/z3ss/BFST

Conflicts:
	ProjectPart1/src/ctrl/StartMap.java
Final changes to project, javadoc missing
Merge branch 'master' of https://github.com/z3ss/BFST

Conflicts:
	ProjectPart1/src/ctrl/KL.java