From GitHub1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/gitHubTest/two/TestTwo.java

Fixed conflicts from GitHub1