worked on unification
Merge branch 'master' of github.com:gnush/spoofax-test

merge