Adding files to merging of edges
Adding files for jar creation
Updating .gitignore