first time commit
Merge branch 'master' of github.com:craigliu/XScrum