first commit
Merge pull request #1 from jayli/master

first commit