Fixing merge conflict due to forgetting to merge the last pull req
Merge pull request #15 from mknudsen01/make-list-look-less-bad

Fixing merge conflict due to forgetting to merge the last pull req