delete-indexfix
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce