fix(merge):

package-lock.json

package.json

src/App.vue

src/assets/SPARESTI.png

src/assets/base.css

src/assets/coffee.png

src/assets/coins.png

src/assets/completed.png

src/assets/finishLine.png

src/assets/main.css

src/assets/mat.png

src/assets/pending.png

src/assets/penger.png

src/assets/spare.png

src/assets/spareSti.png

src/assets/start.png

src/assets/start_page/Spare.png

src/assets/streakFlame.png

src/components/ButtonAddGoalOrChallenge.vue

src/components/NavBarComponent.vue