.gitignore updated
Merge branch 'master' of https://github.com/adrien-louis-r/green-rent

Conflicts:
	nbproject/project.properties