Commit on New branch
Almost there
I think I'm done merging after fixing the two Java.test files

Merge branch 'master' into TempBranchAlpha

Conflicts:
	Test.java