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

Conflicts:
	ProjectPart1/src/ctrl/KL.java
just pulling
Merge branch 'master' of https://github.com/z3ss/BFST
just pulling
Merge branch 'master' of https://github.com/z3ss/BFST
AddressParser changes and tests
Merge branch 'master' of https://github.com/z3ss/BFST

Conflicts:
	ProjectPart1/src/ctrl/KL.java
Conflicts are solved
Merge branch 'master' of https://github.com/z3ss/BFST

Conflicts:
	ProjectPart1/src/ctrl/StartMap.java