Merge branch 'exercise1one'
Merge branch 'master' of https://github.com/JorgeAntonio512/LPTHW-2.0