Merge branch 'master' of https://github.com/ninjahzw/OpenSource-13-06

Conflicts:
homework/HouZhaoWei.md
rewrite the report

rewrite the report