First day of the rest of the project
Merge branch 'master' of https://github.com/guidouil/qoderesto