.gitignore updated for comparing ide files
Merge remote-tracking branch 'origin/master'
Merging between two different versions of eclipse