try this

So , this is what we talked about .. i made some changes , and your turn to pull and merge .. 

this way, me and you can work on the same code without a problem .

After you do that, please change the project from HTML5 project to a pure java project . you dont have to use Maven at this point.