First commit.
Merge pull request #12 from lisafrench/testing-branch

Hi omg please accept this pull request