add displayPopup method in Welcome View
Merge remote-tracking branch 'origin/leo' again ? :D

Conflicts:
	src/View/Welcome.java