Resolving conflict

Conflicts:
	Manuscript/Book_take_2/Part_1/Chapter_Materials/Chapter_Materials.tex
Completed Example A - Materials Chapter
Resolved conflict Materials Chapter