first commit
Merge branch 'master' of https://github.com/Palmabit-IT/package-examples
fix conflict