yet another local change
Merge branch 'master' of https://github.com/kleuthold/GitHubTest.git

Conflicts:
	GitHubTestProject1/src/com/kmlsolutions/GitHubClass.java