Add ignore netbeans project directory (nbproject)
Merge origin/master