Updated gitignore to igonore netbeans files
Merge origin/master