new .gitignore file to ignore netbeans IDE files
merge conflict resolved