Delete useless.p4.txt

deleted my p4 text file -- sarah
Created iwong3.gradle
Merge branch 'ivan' of https://github.com/Rrego6/M2 into ivan
Finished M2 - Version Control, created iwong3.gradle
testing branch
"attemping" Merge branch 'ivan'

Conflicts:
	.gitignore
	M2/M2/.gradle/2.0/taskArtifacts/cache.properties
	M2/M2/.gradle/2.0/taskArtifacts/cache.properties.lock
	M2/M2/.gradle/2.0/taskArtifacts/fileHashes.bin
	M2/M2/.gradle/2.0/taskArtifacts/fileSnapshots.bin
	M2/M2/.gradle/2.0/taskArtifacts/outputFileStates.bin
	M2/M2/.gradle/2.0/taskArtifacts/taskArtifacts.bin
	M2/nbproject/project.properties
attempting to synch Ivan branch