[Waterstrong]: init the shape maker project, practise decorator method
[Waterstrong]: fix the conflict