Homework2和部分资源
小订正
Merge branch 'master' into Solution

Conflicts:
	tests/cpp-tests/Classes/Exercise_2/Exercise_2_1.cpp