add netbeans config file(s) to .gitignore
Merge remote-tracking branch 'origin/master'