assignment 1, karlward, pull request