fix(merge):

src/App.vue

src/assets/base.css

src/assets/main.css

src/assets/sti.png

src/components/ButtonAddGoalOrChallenge.vue

src/components/CardChallenge.vue

src/components/CardGoal.vue

src/components/FormLogin.vue

src/components/FormRegister.vue

src/components/ModalComponent.vue

src/components/NavBarComponent.vue

src/components/PageControl.vue

src/components/ProgressBar.vue

src/types/challenge.ts

src/views/ManageChallengeView.vue

src/views/ManageGoalView.vue

src/views/UserChallengesView.vue

src/views/UserGoalsView.vue

src/views/ViewChallengeView.vue

src/views/ViewGoalView.vue