added getFlavio method
merged
add README
add jonathan
MY modify
Merge branch 'master' of https://github.com/flaviocapacciocnh/new.git
add var
Merge branch 'master' of https://github.com/flaviocapacciocnh/new.git
My commit
add z
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/flavio/Jonathan.java
stringa
My string
Merge branch 'master' of https://github.com/flaviocapacciocnh/new.git

Conflicts:
	src/flavio/Jonathan.java
commit
commit2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/flavio/Jonathan.java
modified
added another var
personal function branch