Merge branch "dev" into "simon-branch"

package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "dev": "npm --prefix task_manager_app/src/views/todo-list run dev",
     "start": "concurrently \"npm run server\" \"npm run client\"",
-    "server": "cd task_manager_app/src && python3 -m controllers.server",
+    "server": "cd task_manager_app/src && python -m controllers.server",
     "client": "npm --prefix task_manager_app/src/views/todo-list run dev"
   },
   "dependencies": {

task_manager_app/docs/meeting_minutes/milestone_4/week_2.md

@@ -0,0 +1,70 @@
+# Feature Progress Report:
+### Kylee
+- Added: multiple lists
+- Needs: rearrange list and rename list
+### Bishakha
+- Added: Due dates for tasks
+- Needs: N/A
+- Notes: (had issue with merge conflict, but resolved)
+### Dominic
+- Added: Reorder task
+- Needs: N/A
+- Notes: Can use functionality for reordering lists
+### Simon
+- Added: Edit task name
+- Needs: Buttons prettier
+- Notes: Edit functionality can extend to the list
+### Jaxon
+- Added: Priority to tasks
+- Needs: task color based on priority? Sort by priority?
+## 
+# Week 2 Planning
+### Discussion: By-task vs by-role - Pros and Cons
+- Dominic: By-task gives you experience with all parts of software
+- Jaxon: By-task worked fine
+- Kylee: By-task led to fast, productive development, but also merge conflicts with independent work.
+
+**Result**: Assignments this week will be by-role, not by-task. Developers will work on all parts of all tasks within their role.
+
+## This week's roles
+Kylee and Simon are Non-developers this week. Here are their assignments:
+- **Simon**
+	- Update UML (Use Case and Class Diagram)
+	- Manual Validation
+- **Kylee**
+	- Update Github Project Board
+	- Select and Draft Design
+
+Developers to focus on their roles:
+- **Dominic**: Front-end
+- **Jaxon**: Backend
+- **Bishakha**: Database
+
+## Tasks to complete
+- **All developers**: Extending multiple list capabilities
+	- Edit name of list
+	- Rearrange list
+- **Dominic**: Notification for a task (to level of day, not time. Also, we may not implement this. TBD based on Teams discussion)
+- **Dominic**: (Optional) aesthetic changes to priority
+- **Jaxon**: Delete list descripton
+- **Jaxon**: Rearrange backend per Professor's instructions
+
+
+
+
+### Development team deadlines:
+- Wednesday: Do individual tasks (extending )
+- Wednesday-Friday: Collaborate
+- Friday night / Saturday Morning: Code is stable and functional
+### Non-Development team deadlines
+- Saturday-Monday: Manual validation and testing (Simon)
+
+
+### Add to scrum board:
+- Hamburger menu does nothing, but should fold in and out
+- Implement date -> datetime for task
+
+
+
+
+