modify
Merge branch 'master' of https://github.com/buptrobin/MyProjects

Conflicts:
	csharp/test1/CareerCup/Chapt2.cs
	csharp/test1/CareerCup/Program.cs

merge