before merging
Merge branch 'master' of https://github.com/andreabar/SDElaborato
new db + other