commit from eclipse, do we need to merge?
Merge branch 'master' of https://github.com/kleuthold/GitHubTest.git

Conflicts:
	GitHubTest1/src/com/kmlsolutions/GitHubTest.java