Added this stuff
Merge https://github.com/petersterling1/301assignment1-psterlin