Initial commit of homework 5 solution.
Complete homework 5 solution.
Merge conflicts.