netbeans files
Merge origin/master
Changed .gitignore to allow netbeans project files
Adding netbeans project data