Some changes
Merge branch 'inheritance_demo_2' of https://github.com/suberbawer/ciclotimia into inheritance_demo_2