updates
Merge branch 'master' of https://github.com/Artificial-Intelligence-FitnessApp/AIFA-group-project