dev tian jia dev
add feature1
add master
jie jue chong tu
dev add dev
merge --no-ff
fix bug 101
merged bug 101