Updated NetBeans
Merge branch 'master' of https://github.com/SWKineo/SpanishVocabManager

Conflicts:
	nbproject/private/private.properties