changes to what i have so far for story
Merge remote-tracking branch 'origin/master'

Conflicts:
	presentation document.docx