base i galaxia
Merge branch 'versio1' of https://github.com/PROP44/propsw into versio1