Merge with git+ssh://sgc@fondialog1.hum.uva.nl/fro/git/sgc.git