Merge branch 'master' of https://github.com/Sillyplus/CppHomeworkProj2

Conflicts:
.DS_Store
update three