Triangle tests and proposition tests updated
Merge branch 'martijn' of https://github.com/martyn82/SST into martijn
P and Q in output