Hw4: Added All Features
Merge pull request #6 from john3209/hw4

Hw4: Added All Features