First time using Git
Merge pull request #3 from caitlinflanagan/master

First time using Git