Hw10: Added All Features
Merge pull request #12 from john3209/hw10

Hw10: Added All Features