misc
Merge branch 'master' of https://github.com/heiyanbin/cpp_projects

Conflicts:
	code_exercise/code_exercise/main.cpp