fixed bug with Nastya, namely in isSupertypeOf in NonTerminalType, and could make implementation of TypeVariablePattern slightly more elegant after fixing this
Merge branch 'master' of github.com:cwi-swat/rascal