Trying to merge
Merge branch 'master' of https://github.com/frenchie4111/Java-Tester

Conflicts:
	src/TestTester.java
Removed main from Test.java