Documentation for iteration two updated.
Completed iteration three

Added basic tests and updated documentation.
Merge branch 'iteration-three'