Fixed merge conflict in projectPageP.ts

client/Activity_card_code/activitity_card.css

client/Database/database.js

client/Database/database.ts

client/Database/initDatabase_test.js

client/KnowledgeBank/completedProjects.js

client/KnowledgeBank/knowledgeBank.css

client/KnowledgeBank/knowledgeBank.html

client/Make_Suggestion_Code/makeSuggestion.css

client/Make_Suggestion_Code/makeSuggestion.html

client/Make_Suggestion_Code/makeSuggestion.js

client/Make_Suggestion_Code/makeSuggestion.ts

client/SidebarAndHeader/pageHandler.js

client/SidebarAndHeader/pageHandler.ts

client/currentProjects/currentProjects.css

client/currentProjects/currentProjects.js

client/currentProjects/currentProjects.ts

client/dist/completedProjects.bundle.js

client/dist/currentProjects.bundle.js

client/dist/homePage.bundle.js

client/dist/ideaBank.bundle.js