added per-link label
Merge branch 'master' of https://github.com/afabbro/interdisciplinary-programming