Finished through Step 13
Merge https://github.com/LizzHale/oop