updated sprint 2
Merge pull request #19 from dolob-mrmr/zhihao

updated sprint 2