bloo
Merge branch 'develop' of https://github.com/Gust4f/bsim into develop

Conflicts:
	CTS/src/main/java/controller/MainController.java
Merge branch 'develop' of https://github.com/Gust4f/bsim into develop
Fixed one bugg and some other shit