Update .gitignore

Resolved conflicts relating to multiple users editing the NetBeans project