pakeistas gitignore
Merge branch 'master' of github.com:shookees/SmartFood

Conflicts:
	nbproject/private/private.properties