Merge origin/master

Conflicts:
	src/testinggithub/TestingGitHub.java