Modified use of suma and added final line
Merge branch '5-other' into dev

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