Finished Part 2
Merge pull request #2 from nickgio/part_2

Finished Part 2