Homework

made some modification at home
Testing Phase 2

Finished Scott's requirement implementation