Changed Welcome method for numbers
Merge branch '6-ultimo' into dev

Conflicts:
	src/com/project/start/Welcome.java