diff --git a/Paper Work/Appraisal.docx b/Paper Work/Appraisal.docx
index e4f1970..9c5d936 100644
Binary files a/Paper Work/Appraisal.docx and b/Paper Work/Appraisal.docx differ
diff --git a/Paper Work/Main Window Diagram.png b/Paper Work/Main Window Diagram.png
new file mode 100644
index 0000000..98ea0e2
Binary files /dev/null and b/Paper Work/Main Window Diagram.png differ
diff --git a/Paper Work/Table of Contents.docx b/Paper Work/Table of Contents.docx
index e69de29..b56d9ee 100644
Binary files a/Paper Work/Table of Contents.docx and b/Paper Work/Table of Contents.docx differ
diff --git a/Paper Work/Testing Log.docx b/Paper Work/Testing Log.docx
index f833a39..ac6c2e8 100644
Binary files a/Paper Work/Testing Log.docx and b/Paper Work/Testing Log.docx differ
diff --git a/Paper Work/To-Do List.txt b/Paper Work/To-Do List.txt
index b740e11..95e3c76 100644
--- a/Paper Work/To-Do List.txt	
+++ b/Paper Work/To-Do List.txt	
@@ -4,6 +4,7 @@ From Diane Feedback:
 	Move technical documentation algorithm screenshots to end (to make bigger!)
 	Technical algorithms into IPSO processes
 
+<<<<<<< HEAD
 	
 Order:
 	Contents
@@ -14,3 +15,28 @@ Order:
 	Technial Documentation
 	User Documentation
 	Appraisal
+=======
+Technical Documentation:
+	Add more important code sections
+
+Testing Log:
+	Add evidence of testing (Another document maybe?)
+	Test more of the objectives
+
+Edit Footers! Done:
+	Anaysis
+	Testing
+	Appraisal
+	IPSO Chart
+	Techincal Documentation
+	User Documentation
+Order:
+	Contents
+	Analysis 1-6
+	IPSO Chart 7
+	Testing 8-9
+	Techincal Documentation 10-16
+	User Documentation 17-18
+	Appraial 19-21
+	
+>>>>>>> b0e75a394013b9474d03a716e2084dc98be19d67