second commit
Merge pull request #39 from janestar/master

my first commit