Assignment 1 pull request

Commit message says what was changed.