My string
Merge branch 'master' of https://github.com/flaviocapacciocnh/new.git

Conflicts:
	src/flavio/Jonathan.java