Updated gitignore to ignore Netbeans project
Fixed merge conflict with gitignore