Merge pull request #1 from KatharineCraven/typescript

Project 2 Pull Request