Updated the gitignore file
Merge branch 'master' of https://github.com/TheOnlyMerlin/CakePHPKicker

Conflicts:
	nbproject/private/private.properties