Pair implementation
Merge branch 'master' of github.com:epol/dromd

Conflicts:
	semantic.ml