from paolo new project
Merge origin/master
from paolo new project
Merge origin/master

Conflicts:
	src/githubtrial/GithubTrial.java