second commit
Merge pull request #2 from bobbychen2000/master

testing2