Update of schen384 gradle
Merge branch 'master' of https://github.com/OBipolar/M2

Conflicts:
	.gradle/2.0/taskArtifacts/cache.properties.lock
	.gradle/2.0/taskArtifacts/fileHashes.bin
	.gradle/2.0/taskArtifacts/fileSnapshots.bin
	.gradle/2.0/taskArtifacts/outputFileStates.bin
	.gradle/2.0/taskArtifacts/taskArtifacts.bin
	build/classes/main/edu/gatech/oad/antlab/person/Person1.class
	build/classes/main/edu/gatech/oad/antlab/person/Person2.class
	build/classes/main/edu/gatech/oad/antlab/person/Person3.class
	build/classes/main/edu/gatech/oad/antlab/person/Person4.class
	build/classes/main/edu/gatech/oad/antlab/person/Person5.class
	build/classes/main/edu/gatech/oad/antlab/pkg1/AntLab11.class
	build/classes/main/edu/gatech/oad/antlab/pkg1/AntLab12.class
	build/classes/main/edu/gatech/oad/antlab/pkg1/AntLabMain.class
	build/classes/main/edu/gatech/oad/antlab/pkg2/AntLab21.class
	build/classes/main/edu/gatech/oad/antlab/pkg2/AntLab22.class
	build/libs/M2.jar