Second edit
Merge branch 'master' of https://github.com/edudev/Emil_Dudev_tues