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

Conflicts:
	ProjectPart1/src/ctrl/ML.java
	ProjectPart1/src/ctrl/StartMap.java
	ProjectPart1/src/model/Road.java
	ProjectPart1/src/view/SideBar.java