netbeans ignore
netbeans ignore
Merge branch 'master' of https://github.com/Goji/BE.Projet

Conflicts:
	.gitignore