Merge branch 'master' of https://github.com/mdolidon/light-hours

Conflicts:
README.md