Revert "Josh's commit"

This reverts commit ee85bb56d069901546155e179c6ff249dd2ea0eb.

Conflicts:
	JoshsTestFile.java
fixed merge conflict