init
Merge pull request #3 from xlxl2010/master

init