init
Merge branch 'master' of github.com:yuye23/StaMa