Local commit.
Merge branch 'master' of https://github.com/twocode/topcoder

Conflicts:
	41/Syntax.c