Hw6: Added All Features
Merge pull request #8 from john3209/hw6

Hw6: Added All Features