Inserted linear metric, still need to put in one last result
Merge branch 'linearmetric'

Conflicts:
	main.pdf
	main.tex
Removed uncalculated results