[20141028] by Sunrise
Merge pull request #18 from junyiacademy/recognizing_shapes

[20141028] by Sunrise