initial commit
Merge pull request #3 from lisaharvey/master

initial commit