Finished part 2
Merge pull request #3 from kateaplin/part2

Finished part 2