Fix merge conflict

README.md

design/PBI-02E-Desain_Menu_Keuangan_Investor.pdf

package-lock.json

package.json

src/App.css

src/App.js

src/components/CardMainan/CardMainan.css

src/components/CardMainan/CardMainan.test.js

src/components/CardMainanLaporan/CardMainanLaporan.css

src/components/CardMainanLaporan/CardMainanLaporan.js

src/components/CardMainanLaporan/CardMainanLaporan.test.js

src/components/CardMesinRusak/CardMesinRusak.css

src/components/CardMesinRusak/CardMesinRusak.js

src/components/CardMesinRusak/CardMesinRusak.test.js

src/components/CardMesinRusak/DeleteLaporan.test.js

src/components/Cards/Cards.js

src/components/Cards/Cards.test.js

src/components/CardsInvestasi/CardsInvestasi.css

src/components/CardsInvestasi/CardsInvestasi.js

src/components/CardsLaporan/CardsLaporan.css