asfdasf

update
Merge remote-tracking branch 'origin/master'

Conflicts:
	topcoder/IntegerGenerator.cpp
	topcoder/tc/topcoder-1/IntegerGenerator.cpp