personal function branch
modified on pippo.java
remove comment
Merge branch 'skill1'

Conflicts:
	src/flavio/Jonathan.java