Merge branch 'master' of https://github.com/thucnd55/ktpm2013

Conflicts:
	Triangle/Test.py
Merge branch 'master' of https://github.com/thucnd55/ktpm2013