Add /nbproject/ to .gitignore.
Merge branch 'master' of github.com:pawaclawczyk/PD into pawaclawczyk-master

Conflicts:
	.gitignore