merge
merge
Merge pull request #2 from njumzs/master

photo beauty
merge temp
Merge branch 'alllenwang-master'