Merge branch 'master' of https://bitbucket.org/theorangeone/saviour-backup-system

Conflicts:
	Paper Work/IPSO Chart.docx
	Paper Work/Technical documentation.docx
	Paper Work/To-Do List.txt
	Paper Work/User Documentation.docx

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