pull request for friday-night hw