modified:   nbproject/private/private.properties
	modified:   nbproject/project.properties
	.gitignore
	nbproject/private/config.properties
Merge branch 'master' of https://github.com/Langhalsdino/LabQuestConverter