first commit
Merge branch 'master' of https://github.com/jinjinxsun/helloworld

Learning github, did a dumb thing, now have to merge...