gradle clean
Merge branch 'master' of https://github.com/supercclank/m2Test

Conflicts:
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.gradle/1.10/taskArtifacts/fileHashes.bin
	.gradle/1.10/taskArtifacts/fileSnapshots.bin
	.gradle/1.10/taskArtifacts/outputFileStates.bin
	.gradle/1.10/taskArtifacts/taskArtifacts.bin
	build/classes/main/edu/gatech/oad/antlab/pkg1/AntLabMain.class
	build/libs/m2Test-1.0.jar
	build/tmp/jar/MANIFEST.MF