Updated .gitignore
Merge.
Added nbproject to .gitignore.