some changes
Merge remote-tracking branch 'origin/vetouz'

Conflicts:
	src/View/Welcome.java