edits from practice today
Merge remote-tracking branch 'origin/master'

Conflicts:
	Presentation/Prob6.log
	Presentation/Prob6.pdf