link
Merge branch 'master' of github.com:scslab/ifc.js

Conflicts:
	paper/main.lhs.tex