Merge origin/master

Conflicts:
	GitHubTest/src/githubtest/GitHubTest.java
Merge origin/master

Conflicts:
	GitHubTest/src/githubtest/GitHubTest.java
Merge origin/master