Initial commit
Initial commit
Merge branch 'master' into codereview
Code for tasks 1 - 3 and 5 is ready for review.
Code refactored to make folder directory structure more clear.