update
Merge branch 'master' of https://github.com/jetyingjia/exercisecode

Conflicts:
	SORT/SORT/main.cpp