actualitzo
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into joan
herencia amb mst
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into joan
guardo citigenerator