modified gitignore
updated makeFile
nocare
Merge origin/master

Conflicts:
	nbproject/configurations.xml
	nbproject/private/private.xml