新加了几题。
Merge branch 'master' of github.com:Senorsen/CProgrammingLanguage

Conflicts:
	40012/40012.c
	40012/README.txt