fixed merge conflicts

README.md

+# TDDD27_2020_DISCORE
+
+Author:
+Name - Gustaf Wallström
+Liuid - gusan112
+
+Functional Description: 
+
+This is a project in the course TDDD27 - Advanced Web Programming. It is a web application for keeping track of your score when playing disc golf.
+Basics:
+- You are able to create a user to save your scores (number of total strokes and the difference from the course´s par). 
+- Users can look at other users scores.
+- When playing you can either choose a pre-added course or add a new one (keeps track of par and number of holes).
+Extendend goals if there´s time:
+- You can add another user while playing to add a match for them aswell.
+- Graphs to see the progression of your games.
+
+Technical Description:
+
+- Angular is used for front-end, client side.
+- Mongo DB is used for back-end, server side.
+
+Link for mid-term screencast:
+
+https://youtu.be/ddBd5uAk9jc