merge conflicts fixed

.vscode/settings.json

client/src/app/add-post/add-post.component.css

client/src/app/add-post/add-post.component.html

client/src/app/add-post/add-post.component.ts

client/src/app/add-post/add-post.service.ts

client/src/app/app.module.ts

client/src/app/graph/graph.component.html

client/src/app/graph/graph.component.spec.ts

client/src/app/graph/graph.component.ts

client/src/app/graph/graph.service.ts

client/src/app/home/home.component.css

client/src/app/login/login.component.css

client/src/app/models/course.model.ts

client/src/app/show-post/show-post.component.css

client/src/app/show-post/show-post.component.html

server/app.js

server/model/course.js