Merge origin/master

Conflicts:
	src/githubtrial/GithubTrial.java
Merge origin/master
Merge origin/master

Conflicts:
	src/githubtrial/GithubTrial.java