not the slightest idea what this is

	modified:   exp8/report/report8.tex
Merge branch 'master' of github.com:HappyEmu/physics-reports

Conflicts:
	exp8/report/report8.tex