Hw3: Added All Features
Merge pull request #5 from john3209/hw3

Hw3: Added All Features