testing code added
Merge branch 'master' of https://github.com/n-martin/DPM-team4