attempt to include rinside
added new version of matching
Merge branch 'master' of https://github.com/qreal/tools