first commit
Merge pull request #3 from christopherfan/tim-branch

first commit