nothing much
Implemented the popup
Merge branch 'dev_atimu'

Conflicts:
	src/Controller/MainController.java