updated after SC
Merge branch 'master' of https://github.com/Robinlovelace/IPF-performance-testing

Conflicts:
	paper/ipfinr.pdf
	paper/ipfinr.tex