"update on gitignore to nb files"
""Merge branch 'master' of https://github.com/War-UFF-ESII20142/Fonte

Conflicts:
	build/built-jar.properties
"adding db"