add the gitignore file
remove generate files
add project.properties to gitignore
gitignore modified
merged..