Config
Merge branch 'master' of https://github.com/DorsanD/Kuifke_1

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml