initial commit
Merge pull request #1 from emilymcafee/master

initial commit