deleted merge file
Merge branch 'master' of https://github.com/jeuris/steiner_dev