st
Merge branch 'master' of https://github.com/stefanoantonel/ChietiV2.git

Conflicts:
	Chieti/db.sqlite3
add git ignore
add git ignore
Merge branch 'master' of https://github.com/stefanoantonel/ChietiV2.git
con la BD en mysql y merge
Merge branch 'master' of https://github.com/stefanoantonel/ChietiV2.git

Conflicts:
	Chieti/chieti/templates/chieti/productsTemplate.html
nn
Merge branch 'master' of https://github.com/stefanoantonel/ChietiV2.git

Conflicts:
	Chieti/chieti/templates/chieti/addProduct.html
	Chieti/chieti/templates/chieti/productsTemplate.html