last changes for duplication
Merge branch 'master' of github.com:ruudvanderweijde/Software-Evolution-2013-2014