funcs DONE
Merge branch 'master' of https://github.com/francescamille/VERSION_AB1L_GROUP2
working funcs lahat