.gitignore and main.java
merge
Deleted trash