added main.java
Merge branch 'dev'