First time using git.
Merge pull request #5 from marniemccall/master

First time using git.