initial commit
Merge github.com:PiscesDream/14summer