mroe edits to intro and objectives, got objective 1 to fit on page 1
fixed dem darn merge conflicts. just deleted everything matt wrote and kept my text. he will never notice.