Agregar al .gitignore la carpeta nbproject (NetBeans)
Merge branch 'dev' of github.com:cherra/squab into dev

Conflicts:
	.gitignore