deleting eclipse specific files from the project
adding Eclipse specific files to .gitignore
Merge remote-tracking branch 'refs/remotes/upstream/master'