potato
Merge branch 'master' of https://github.com/RubySmith/JavaTheHutt

Conflicts:
	M2/.gradle/1.10/taskArtifacts/cache.properties.lock
	M2/.gradle/1.10/taskArtifacts/fileHashes.bin
	M2/.gradle/1.10/taskArtifacts/fileSnapshots.bin
	M2/.gradle/1.10/taskArtifacts/taskArtifacts.bin