better Netbeans ignore

Conflicts:
	.gitignore