lol first
Added main java file
Merge branch 'master' of https://www.github.com/Teferet/project6