Finished #5.
Merge branch 'master' of https://github.com/kacieanderson/hw2