Final Version of Increment 02
Merge pull request #4 from jinlee0908/peterbranch

Final Version of Increment 02