My MainTest git add src/MainTest.java
super merge'