Add gitignore
Maven project
Merge fixed