Update q3. Fix q1 cpp. Add strcomp
Merge branch 'master' of github.com:DaMSL/K3-Core
Add merge fn to q1.k3