Updated Test.java
Fixing conflict

Conflicts:
	src/Test.java